diff --git a/.circleci/config.yml b/.circleci/config.yml
index 43fba6e7..05aef636 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -1,5 +1,7 @@
 version: 2.1
 
+orbs:
+  browser-tools: circleci/browser-tools@1.1.3
 workflows:
   version: 2
   build_and_test:
@@ -15,13 +17,11 @@ executors:
   node:
     working_directory: ~/pinafore
     docker:
-      # we want Node v12, not v14
-      # see https://discuss.circleci.com/t/build-failed-the-engine-node-is-incompatible-with-this-module-expected-version-12-x-got-14-15-0/37921/7
-      - image: circleci/ruby@sha256:b018ec2a8f0bbf06880735d2801402bad316c465edb60663be83ac8f1086b805
+      - image: cimg/ruby:2.7.2-browsers
   node_and_ruby:
     working_directory: ~/pinafore
     docker:
-      - image: circleci/ruby@sha256:b018ec2a8f0bbf06880735d2801402bad316c465edb60663be83ac8f1086b805
+      - image: cimg/ruby:2.7.2-browsers
       - image: circleci/postgres:12.2
         environment:
           POSTGRES_USER: pinafore
@@ -30,6 +30,45 @@ executors:
           BROWSER: chrome:headless
       - image: circleci/redis:5-alpine
 commands:
+  install_mastodon_system_dependencies:
+    description: Install system dependencies that Mastodon requires
+    steps:
+      - run:
+          name: Install system dependencies
+          command: |
+            sudo apt-get update
+            sudo apt-get install -y \
+              ffmpeg \
+              fonts-noto-color-emoji \
+              imagemagick \
+              libicu-dev \
+              libidn11-dev \
+              libprotobuf-dev \
+              postgresql-contrib \
+              protobuf-compiler
+  install_browsers:
+    description: Install browsers and tools
+    steps:
+      - browser-tools/install-chrome:
+          chrome-version: 91.0.4472.114
+      - browser-tools/install-chromedriver
+      - run:
+          name: "Check browser version"
+          command: |
+            google-chrome --version
+  install_node:
+    description: Install Node.js
+    steps:
+      - run:
+          name: "Install Node.js"
+          # via https://circleci.com/docs/2.0/circleci-images/#notes-on-pinning-images
+          command: |
+            curl -sSL "https://nodejs.org/dist/v12.22.2/node-v12.22.2-linux-x64.tar.xz" \
+            | sudo tar --strip-components=2 -xJ -C /usr/local/bin/ node-v12.22.2-linux-x64/bin/node
+      - run:
+          name: Check current version of node
+          command: node -v
+
   save_workspace:
     description: Persist workspace
     steps:
@@ -47,13 +86,13 @@ commands:
     steps:
       - restore_cache:
           name: Restore yarn cache
-          key: yarn-v3-{{ checksum "yarn.lock" }}
+          key: yarn-v4-{{ checksum "yarn.lock" }}
   save_yarn_cache:
     description: Save yarn cache
     steps:
       - save_cache:
           name: Save yarn cache
-          key: yarn-v3-{{ checksum "yarn.lock" }}
+          key: yarn-v4-{{ checksum "yarn.lock" }}
           paths:
             - ~/.cache/yarn
   restore_yarn_cache_mastodon:
@@ -61,13 +100,13 @@ commands:
     steps:
       - restore_cache:
           name: Restore yarn cache for Mastodon
-          key: yarn-v3-{{ checksum "mastodon/yarn.lock" }}
+          key: yarn-v4-{{ checksum "mastodon/yarn.lock" }}
   save_yarn_cache_mastodon:
     description: Save yarn cache for Mastodon
     steps:
       - save_cache:
           name: Save yarn cache for Mastodon
-          key: yarn-v3-{{ checksum "mastodon/yarn.lock" }}
+          key: yarn-v4-{{ checksum "mastodon/yarn.lock" }}
           paths:
             - ~/.cache/yarn
   restore_bundler_cache:
@@ -75,23 +114,18 @@ commands:
     steps:
       - restore_cache:
           name: Restore bundler cache
-          key: bundler-v2-{{ checksum "mastodon/Gemfile.lock" }}
+          key: bundler-v4-{{ checksum "mastodon/Gemfile.lock" }}
   save_bundler_cache:
     description: Save bundler cache
     steps:
       - save_cache:
           name: Save bundler cache
-          key: bundler-v2-{{ checksum "mastodon/Gemfile.lock" }}
+          key: bundler-v4-{{ checksum "mastodon/Gemfile.lock" }}
           paths:
             - mastodon/vendor/bundle
   install_mastodon:
     description: Install Mastodon and set up Postgres/Redis
     steps:
-      - run:
-          name: Install system dependencies
-          command: |
-            sudo apt-get update
-            sudo apt-get install -y ffmpeg fonts-noto-color-emoji libicu-dev libidn11-dev libprotobuf-dev postgresql-contrib protobuf-compiler
       - run:
           name: Clone mastodon
           command: yarn clone-mastodon
@@ -127,6 +161,7 @@ jobs:
     executor: node
     steps:
       - checkout
+      - install_node
       - restore_yarn_cache
       - run:
           name: Yarn install
@@ -156,6 +191,9 @@ jobs:
   integration_test_readonly:
     executor: node_and_ruby
     steps:
+      - install_mastodon_system_dependencies
+      - install_browsers
+      - install_node
       - load_workspace
       - install_mastodon
       - run:
@@ -164,6 +202,9 @@ jobs:
   integration_test_readwrite:
     executor: node_and_ruby
     steps:
+      - install_mastodon_system_dependencies
+      - install_browsers
+      - install_node
       - load_workspace
       - install_mastodon
       - run:
diff --git a/.gitignore b/.gitignore
index 4e191c72..356c3b52 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,3 +14,4 @@ yarn-error.log
 
 .now
 .vercel
+/webpack/*.cjs
diff --git a/bin/build-assets.js b/bin/build-assets.js
index dbd71a27..f493c724 100644
--- a/bin/build-assets.js
+++ b/bin/build-assets.js
@@ -1,9 +1,10 @@
 import path from 'path'
 import fs from 'fs'
 import { promisify } from 'util'
-import { LOCALE } from '../src/routes/_static/intl'
-import { getIntl, trimWhitespace } from './getIntl'
+import { LOCALE } from '../src/routes/_static/intl.js'
+import { getIntl, trimWhitespace } from './getIntl.js'
 
+const __dirname = path.dirname(new URL(import.meta.url).pathname)
 const readFile = promisify(fs.readFile)
 const writeFile = promisify(fs.writeFile)
 
diff --git a/bin/build-inline-script.js b/bin/build-inline-script.js
index 74626441..e0dc2e56 100644
--- a/bin/build-inline-script.js
+++ b/bin/build-inline-script.js
@@ -5,13 +5,12 @@ import path from 'path'
 import { rollup } from 'rollup'
 import { terser } from 'rollup-plugin-terser'
 import replace from '@rollup/plugin-replace'
-import fromPairs from 'lodash-es/fromPairs'
-import { themes } from '../src/routes/_static/themes'
-import terserOptions from './terserOptions'
+import { themes } from '../src/routes/_static/themes.js'
+import terserOptions from './terserOptions.js'
 
+const __dirname = path.dirname(new URL(import.meta.url).pathname)
 const writeFile = promisify(fs.writeFile)
-
-const themeColors = fromPairs(themes.map(_ => ([_.name, _.color])))
+const themeColors = Object.fromEntries(themes.map(_ => ([_.name, _.color])))
 
 export async function buildInlineScript () {
   const inlineScriptPath = path.join(__dirname, '../src/inline-script/inline-script.js')
@@ -42,7 +41,7 @@ export async function buildInlineScript () {
   const checksum = crypto.createHash('sha256').update(fullCode, 'utf8').digest('base64')
 
   await writeFile(path.resolve(__dirname, '../src/inline-script/checksum.js'),
-    `module.exports = ${JSON.stringify(checksum)}`, 'utf8')
+    `export default ${JSON.stringify(checksum)}`, 'utf8')
   await writeFile(path.resolve(__dirname, '../static/inline-script.js.map'),
     map.toString(), 'utf8')
 
diff --git a/bin/build-sass.js b/bin/build-sass.js
index 8beab8ef..25e3f67f 100755
--- a/bin/build-sass.js
+++ b/bin/build-sass.js
@@ -3,10 +3,12 @@ import path from 'path'
 import fs from 'fs'
 import { promisify } from 'util'
 import cssDedoupe from 'css-dedoupe'
-import { TextDecoder } from 'text-encoding'
+import textEncodingPackage from 'text-encoding'
+const { TextDecoder } = textEncodingPackage
 
 const writeFile = promisify(fs.writeFile)
 const readdir = promisify(fs.readdir)
+const __dirname = path.dirname(new URL(import.meta.url).pathname)
 
 const globalScss = path.join(__dirname, '../src/scss/global.scss')
 const defaultThemeScss = path.join(__dirname, '../src/scss/themes/_default.scss')
diff --git a/bin/build-svg.js b/bin/build-svg.js
index de2e445a..18c83a4a 100755
--- a/bin/build-svg.js
+++ b/bin/build-svg.js
@@ -1,10 +1,13 @@
-import svgs from './svgs'
+import svgs from './svgs.js'
 import path from 'path'
 import fs from 'fs'
 import { promisify } from 'util'
 import { optimize } from 'svgo'
-import $ from 'cheerio'
+import cheerioPackage from 'cheerio'
 
+const { default: $ } = cheerioPackage
+
+const __dirname = path.dirname(new URL(import.meta.url).pathname)
 const readFile = promisify(fs.readFile)
 const writeFile = promisify(fs.writeFile)
 
diff --git a/bin/build-template-html.js b/bin/build-template-html.js
index fc4347d6..46e089a3 100644
--- a/bin/build-template-html.js
+++ b/bin/build-template-html.js
@@ -2,15 +2,18 @@ import chokidar from 'chokidar'
 import fs from 'fs'
 import path from 'path'
 import { promisify } from 'util'
-import { buildSass } from './build-sass'
-import { buildInlineScript } from './build-inline-script'
-import { buildSvg } from './build-svg'
+import { buildSass } from './build-sass.js'
+import { buildInlineScript } from './build-inline-script.js'
+import { buildSvg } from './build-svg.js'
 import { performance } from 'perf_hooks'
-import debounce from 'lodash-es/debounce'
-import applyIntl from '../webpack/svelte-intl-loader'
-import { LOCALE } from '../src/routes/_static/intl'
-import { getLangDir } from 'rtl-detect'
+import { debounce } from '../src/routes/_thirdparty/lodash/timers.js'
+import applyIntl from '../webpack/svelte-intl-loader.js'
+import { LOCALE } from '../src/routes/_static/intl.js'
+import rtlDetectPackage from 'rtl-detect'
 
+const { getLangDir } = rtlDetectPackage
+
+const __dirname = path.dirname(new URL(import.meta.url).pathname)
 const writeFile = promisify(fs.writeFile)
 const LOCALE_DIRECTION = getLangDir(LOCALE)
 const DEBOUNCE = 500
diff --git a/bin/build-vercel-json.js b/bin/build-vercel-json.js
index 6908cac1..02aeeb69 100644
--- a/bin/build-vercel-json.js
+++ b/bin/build-vercel-json.js
@@ -5,11 +5,12 @@
 import path from 'path'
 import fs from 'fs'
 import { promisify } from 'util'
-import { routes } from '../__sapper__/service-worker'
-import cloneDeep from 'lodash-es/cloneDeep'
-import inlineScriptChecksum from '../src/inline-script/checksum'
-import { sapperInlineScriptChecksums } from '../src/server/sapperInlineScriptChecksums'
+import { routes } from '../__sapper__/service-worker.js'
+import { cloneDeep } from '../src/routes/_utils/lodash-lite.js'
+import inlineScriptChecksum from '../src/inline-script/checksum.js'
+import { sapperInlineScriptChecksums } from '../src/server/sapperInlineScriptChecksums.js'
 
+const __dirname = path.dirname(new URL(import.meta.url).pathname)
 const writeFile = promisify(fs.writeFile)
 
 const JSON_TEMPLATE = {
diff --git a/bin/clone-mastodon.js b/bin/clone-mastodon.js
index 3d98c880..0de52087 100644
--- a/bin/clone-mastodon.js
+++ b/bin/clone-mastodon.js
@@ -2,11 +2,13 @@ import { promisify } from 'util'
 import childProcessPromise from 'child-process-promise'
 import path from 'path'
 import fs from 'fs'
-import { envFile, RUBY_VERSION } from './mastodon-config'
+import { envFile, RUBY_VERSION } from './mastodon-config.js'
+import esMain from 'es-main'
 
 const exec = childProcessPromise.exec
 const stat = promisify(fs.stat)
 const writeFile = promisify(fs.writeFile)
+const __dirname = path.dirname(new URL(import.meta.url).pathname)
 const dir = __dirname
 
 const GIT_URL = 'https://github.com/tootsuite/mastodon.git'
@@ -25,7 +27,7 @@ export default async function cloneMastodon () {
   }
 }
 
-if (require.main === module) {
+if (esMain(import.meta)) {
   cloneMastodon().catch(err => {
     console.error(err)
     process.exit(1)
diff --git a/bin/getIntl.js b/bin/getIntl.js
index 519c075e..c9ad2649 100644
--- a/bin/getIntl.js
+++ b/bin/getIntl.js
@@ -1,9 +1,19 @@
-import { get } from 'lodash-es'
-import { DEFAULT_LOCALE, LOCALE } from '../src/routes/_static/intl'
-import path from 'path'
+import { get } from '../src/routes/_utils/lodash-lite.js'
+import { DEFAULT_LOCALE, LOCALE } from '../src/routes/_static/intl.js'
 
-const intl = require(path.join(__dirname, '../src/intl', LOCALE + '.js')).default
-const defaultIntl = require(path.join(__dirname, '../src/intl', DEFAULT_LOCALE + '.js')).default
+import enUS from '../src/intl/en-US.js'
+import fr from '../src/intl/fr.js'
+import de from '../src/intl/de.js'
+
+// TODO: make it so we don't have to explicitly list these out
+const locales = {
+  'en-US': enUS,
+  fr,
+  de
+}
+
+const intl = locales[LOCALE]
+const defaultIntl = locales[DEFAULT_LOCALE]
 
 export function warningOrError (message) { // avoid crashing the whole server on `yarn dev`
   if (process.env.NODE_ENV === 'production') {
@@ -14,6 +24,7 @@ export function warningOrError (message) { // avoid crashing the whole server on
 }
 
 export function getIntl (path) {
+  path = path.split('.')
   const res = get(intl, path, get(defaultIntl, path))
   if (typeof res !== 'string') {
     return warningOrError('Unknown intl string: ' + JSON.stringify(path))
diff --git a/bin/install-mastodon.js b/bin/install-mastodon.js
index 856a7221..8dd0519e 100644
--- a/bin/install-mastodon.js
+++ b/bin/install-mastodon.js
@@ -2,12 +2,14 @@ import { promisify } from 'util'
 import childProcessPromise from 'child-process-promise'
 import path from 'path'
 import fs from 'fs'
-import { DB_NAME, DB_PASS, DB_USER, mastodonDir, env } from './mastodon-config'
+import { DB_NAME, DB_PASS, DB_USER, mastodonDir, env } from './mastodon-config.js'
 import mkdirp from 'mkdirp'
+import esMain from 'es-main'
 
 const exec = childProcessPromise.exec
 const stat = promisify(fs.stat)
 const writeFile = promisify(fs.writeFile)
+const __dirname = path.dirname(new URL(import.meta.url).pathname)
 const dir = __dirname
 
 async function setupMastodonDatabase () {
@@ -69,7 +71,7 @@ export default async function installMastodon () {
   await installMastodonDependencies()
 }
 
-if (require.main === module) {
+if (esMain(import.meta)) {
   installMastodon().catch(err => {
     console.error(err)
     process.exit(1)
diff --git a/bin/mastodon-config.js b/bin/mastodon-config.js
index 88ba0b17..bbbf7718 100644
--- a/bin/mastodon-config.js
+++ b/bin/mastodon-config.js
@@ -17,10 +17,9 @@ DB_NAME=${DB_NAME}
 DB_PASS=${DB_PASS}
 `
 
-// Need a Ruby version that CircleCI bundles with Node v12, not Node v14 which doesn't
-// work for streaming
-export const RUBY_VERSION = '2.6.6'
+export const RUBY_VERSION = '2.7.2'
 
+const __dirname = path.dirname(new URL(import.meta.url).pathname)
 export const mastodonDir = path.join(__dirname, '../mastodon')
 
 export const env = Object.assign({}, process.env, {
diff --git a/bin/mastodon-data.js b/bin/mastodon-data.js
index fc2337a8..38707ddf 100644
--- a/bin/mastodon-data.js
+++ b/bin/mastodon-data.js
@@ -1,4 +1,4 @@
-import times from 'lodash-es/times'
+import { times } from '../src/routes/_utils/lodash-lite.js'
 
 function unrollThread (user, prefix, privacy, thread) {
   const res = []
diff --git a/bin/restore-mastodon-data.js b/bin/restore-mastodon-data.js
index 41159d91..c519cb13 100644
--- a/bin/restore-mastodon-data.js
+++ b/bin/restore-mastodon-data.js
@@ -1,13 +1,13 @@
-import { actions } from './mastodon-data'
-import { users } from '../tests/users'
-import { postStatus } from '../src/routes/_api/statuses'
-import { followAccount } from '../src/routes/_api/follow'
-import { favoriteStatus } from '../src/routes/_api/favorite'
-import { reblogStatus } from '../src/routes/_api/reblog'
+import { actions } from './mastodon-data.js'
+import { users } from '../tests/users.js'
+import { postStatus } from '../src/routes/_api/statuses.js'
+import { followAccount } from '../src/routes/_api/follow.js'
+import { favoriteStatus } from '../src/routes/_api/favorite.js'
+import { reblogStatus } from '../src/routes/_api/reblog.js'
 import fetch from 'node-fetch'
 import FileApi from 'file-api'
-import { pinStatus } from '../src/routes/_api/pin'
-import { submitMedia } from '../tests/submitMedia'
+import { pinStatus } from '../src/routes/_api/pin.js'
+import { submitMedia } from '../tests/submitMedia.js'
 
 global.File = FileApi.File
 global.FormData = FileApi.FormData
diff --git a/bin/run-mastodon.js b/bin/run-mastodon.js
index 55b4b802..08f7d11f 100644
--- a/bin/run-mastodon.js
+++ b/bin/run-mastodon.js
@@ -1,10 +1,10 @@
-import { restoreMastodonData } from './restore-mastodon-data'
+import { restoreMastodonData } from './restore-mastodon-data.js'
 import childProcessPromise from 'child-process-promise'
 import fs from 'fs'
-import { waitForMastodonUiToStart, waitForMastodonApiToStart } from './wait-for-mastodon-to-start'
-import cloneMastodon from './clone-mastodon'
-import installMastodon from './install-mastodon'
-import { mastodonDir, env } from './mastodon-config'
+import { waitForMastodonUiToStart, waitForMastodonApiToStart } from './wait-for-mastodon-to-start.js'
+import cloneMastodon from './clone-mastodon.js'
+import installMastodon from './install-mastodon.js'
+import { mastodonDir, env } from './mastodon-config.js'
 
 const spawn = childProcessPromise.spawn
 
diff --git a/bin/svgs.js b/bin/svgs.js
index 683ebeef..0409f0fb 100644
--- a/bin/svgs.js
+++ b/bin/svgs.js
@@ -1,4 +1,4 @@
-module.exports = [
+export default [
   { id: 'pinafore-logo', src: 'src/static/sailboat.svg', inline: true },
   { id: 'fa-bell', src: 'src/thirdparty/font-awesome-svg-png/white/svg/bell.svg', inline: true },
   { id: 'fa-users', src: 'src/thirdparty/font-awesome-svg-png/white/svg/users.svg', inline: true },
diff --git a/bin/terserOptions.js b/bin/terserOptions.js
index d8495f8d..9505a55e 100644
--- a/bin/terserOptions.js
+++ b/bin/terserOptions.js
@@ -1,4 +1,4 @@
-module.exports = {
+export default {
   ecma: 8,
   mangle: true,
   compress: {
diff --git a/bin/wait-for-mastodon-data.js b/bin/wait-for-mastodon-data.js
index a332a7cf..8ed22d70 100644
--- a/bin/wait-for-mastodon-data.js
+++ b/bin/wait-for-mastodon-data.js
@@ -1,5 +1,6 @@
 import fetch from 'node-fetch'
-import { actions } from './mastodon-data'
+import { actions } from './mastodon-data.js'
+import esMain from 'es-main'
 
 const numStatuses = actions
   .map(_ => _.post || _.boost)
@@ -26,7 +27,7 @@ async function waitForMastodonData () {
   console.log('Mastodon data populated')
 }
 
-if (require.main === module) {
+if (esMain(import.meta)) {
   waitForMastodonData().catch(err => {
     console.error(err)
     process.exit(1)
diff --git a/bin/wait-for-mastodon-to-start.js b/bin/wait-for-mastodon-to-start.js
index d0260c45..b9c460ee 100644
--- a/bin/wait-for-mastodon-to-start.js
+++ b/bin/wait-for-mastodon-to-start.js
@@ -1,4 +1,5 @@
 import fetch from 'node-fetch'
+import esMain from 'es-main'
 
 export async function waitForMastodonUiToStart () {
   while (true) {
@@ -30,7 +31,7 @@ export async function waitForMastodonApiToStart () {
   console.log('Mastodon API started up')
 }
 
-if (require.main === module) {
+if (esMain(import.meta)) {
   Promise.resolve()
     .then(waitForMastodonApiToStart)
     .then(waitForMastodonUiToStart).catch(err => {
diff --git a/package.json b/package.json
index cf06c3ab..f688ad7c 100644
--- a/package.json
+++ b/package.json
@@ -2,24 +2,29 @@
   "name": "pinafore",
   "description": "Alternative web client for Mastodon",
   "version": "1.24.5",
+  "type": "module",
+  "engines": {
+    "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
+  },
   "scripts": {
     "lint": "standard && standard --plugin html 'src/routes/**/*.html'",
     "lint-fix": "standard --fix && standard --fix --plugin html 'src/routes/**/*.html'",
-    "dev": "run-s build-template-html build-assets serve-dev",
+    "dev": "run-s before-build serve-dev",
     "serve-dev": "run-p --race build-template-html-watch sapper-dev",
-    "sapper-dev": "cross-env NODE_ENV=development PORT=4002 node -r esm ./node_modules/sapper/sapper dev",
-    "before-build": "run-s build-template-html build-assets",
+    "sapper-dev": "cross-env NODE_ENV=development PORT=4002 WEBPACK_CONFIG_FILE=webpack/webpack.config.cjs SERVER_FILE_EXT=cjs node ./node_modules/sapper/sapper dev",
+    "before-build": "run-p build-template-html build-assets build-webpack-config",
     "build": "cross-env NODE_ENV=production run-s build-steps",
     "build-steps": "run-s before-build sapper-export build-vercel-json",
-    "sapper-build": "node -r esm ./node_modules/sapper/sapper build",
+    "sapper-build": "cross-env WEBPACK_CONFIG_FILE=webpack/webpack.config.cjs SERVER_FILE_EXT=cjs node ./node_modules/sapper/sapper build",
     "start": "node server.js",
     "build-and-start": "run-s build start",
-    "build-template-html": "node -r esm ./bin/build-template-html.js",
-    "build-template-html-watch": "node -r esm ./bin/build-template-html.js --watch",
-    "build-assets": "node -r esm ./bin/build-assets.js",
-    "clone-mastodon": "node -r esm ./bin/clone-mastodon.js",
-    "install-mastodon": "node -r esm ./bin/install-mastodon.js",
-    "run-mastodon": "node -r esm ./bin/run-mastodon.js",
+    "build-template-html": "node ./bin/build-template-html.js",
+    "build-template-html-watch": "node ./bin/build-template-html.js --watch",
+    "build-assets": "node ./bin/build-assets.js",
+    "build-webpack-config": "rollup -c ./webpack/rollup.config.js",
+    "clone-mastodon": "node ./bin/clone-mastodon.js",
+    "install-mastodon": "node ./bin/install-mastodon.js",
+    "run-mastodon": "node ./bin/run-mastodon.js",
     "test": "cross-env BROWSER=chrome:headless run-s test-browser",
     "test-browser": "run-p --race run-mastodon build-and-start test-mastodon",
     "test-mastodon": "run-s wait-for-mastodon-to-start wait-for-mastodon-data testcafe",
@@ -28,25 +33,27 @@
     "testcafe": "run-s testcafe-suite0 testcafe-suite1",
     "testcafe-suite0": "cross-env-shell testcafe -c 2 $BROWSER tests/spec/0*",
     "testcafe-suite1": "cross-env-shell testcafe $BROWSER tests/spec/1*",
-    "test-unit": "NODE_ENV=test mocha -r esm -r bin/browser-shim.js tests/unit/",
+    "test-unit": "NODE_ENV=test mocha -r bin/browser-shim.js tests/unit/",
     "test-in-ci-suite0": "cross-env BROWSER=chrome:headless run-p --race run-mastodon start test-mastodon-suite0",
     "test-in-ci-suite1": "cross-env BROWSER=chrome:headless run-p --race run-mastodon start test-mastodon-suite1",
-    "wait-for-mastodon-to-start": "node -r esm bin/wait-for-mastodon-to-start.js",
-    "wait-for-mastodon-data": "node -r esm bin/wait-for-mastodon-data.js",
+    "wait-for-mastodon-to-start": "node bin/wait-for-mastodon-to-start.js",
+    "wait-for-mastodon-data": "node bin/wait-for-mastodon-data.js",
     "backup-mastodon-data": "./bin/backup-mastodon-data.sh",
-    "sapper-export": "cross-env PORT=22939 node -r esm ./node_modules/sapper/sapper export",
+    "sapper-export": "cross-env PORT=22939 WEBPACK_CONFIG_FILE=webpack/webpack.config.cjs SERVER_FILE_EXT=cjs node ./node_modules/sapper/sapper export",
     "print-export-info": "node ./bin/print-export-info.js",
     "export-steps": "run-s before-build sapper-export print-export-info",
     "export": "cross-env NODE_ENV=production run-s export-steps",
     "now-build": "run-s export",
-    "build-vercel-json": "node -r esm bin/build-vercel-json.js"
+    "build-vercel-json": "node bin/build-vercel-json.js"
   },
   "dependencies": {
     "@formatjs/intl-listformat": "^6.2.6",
     "@formatjs/intl-locale": "^2.4.33",
     "@formatjs/intl-pluralrules": "^4.0.28",
     "@formatjs/intl-relativetimeformat": "^9.1.7",
+    "@rollup/plugin-json": "^4.1.0",
     "@rollup/plugin-replace": "^2.4.2",
+    "@stdlib/utils-noop": "^0.0.6",
     "arrow-key-navigation": "^1.2.0",
     "blurhash": "^1.1.3",
     "cheerio": "1.0.0-rc.10",
@@ -60,6 +67,7 @@
     "emoji-picker-element-data": "^1.2.0",
     "emoji-regex": "^9.2.2",
     "encoding": "^0.1.13",
+    "es-main": "^1.0.2",
     "escape-html": "^1.0.3",
     "esm": "^3.2.25",
     "events-light": "^1.0.5",
@@ -75,8 +83,6 @@
     "is-emoji-supported": "^0.0.5",
     "li": "^1.3.0",
     "localstorage-memory": "^1.0.3",
-    "lodash-es": "4.17.15",
-    "lodash-webpack-plugin": "^0.11.6",
     "mkdirp": "^1.0.4",
     "node-fetch": "^2.6.1",
     "npm-run-all": "^4.1.5",
@@ -90,7 +96,7 @@
     "rollup-plugin-terser": "^7.0.2",
     "rtl-detect": "^1.0.3",
     "safari-14-idb-fix": "^1.0.3",
-    "sapper": "nolanlawson/sapper#for-pinafore-25",
+    "sapper": "nolanlawson/sapper#for-pinafore-26",
     "sass": "^1.35.1",
     "stringz": "^2.1.0",
     "svelte": "^2.16.1",
@@ -118,10 +124,10 @@
     "standard": "^16.0.3",
     "testcafe": "^1.15.0-rc.3"
   },
-  "engines": {
-    "node": ">= 8"
-  },
   "standard": {
+    "ignore": [
+      "webpack/*.cjs"
+    ],
     "globals": [
       "AbortController",
       "Blob",
diff --git a/server.js b/server.js
index 1315be22..18f4d52c 100755
--- a/server.js
+++ b/server.js
@@ -1,9 +1,16 @@
 #!/usr/bin/env node
+import fs from 'fs'
+import path from 'path'
+import express from 'express'
+import compression from 'compression'
 
-const path = require('path')
-const express = require('express')
-const compression = require('compression')
-const { routes: rawRoutes } = require('./vercel.json')
+const __dirname = path.dirname(new URL(import.meta.url).pathname)
+
+// JSON files not supported in ESM yet
+// https://gist.github.com/sindresorhus/a39789f98801d908bbc7ff3ecc99d99c#how-can-i-import-json
+const vercelJson = JSON.parse(fs.readFileSync(path.join(__dirname, 'vercel.json'), 'utf8'))
+
+const { routes: rawRoutes } = vercelJson
 
 const { PORT = 4002 } = process.env
 const app = express()
diff --git a/src/client.js b/src/client.js
index 1a9b83df..02b36601 100644
--- a/src/client.js
+++ b/src/client.js
@@ -1,12 +1,12 @@
 import * as sapper from '../__sapper__/client.js'
-import './routes/_utils/serviceWorkerClient'
-import './routes/_utils/historyEvents'
-import './routes/_utils/loadingMask'
-import './routes/_utils/forceOnline'
-import { mark, stop } from './routes/_utils/marks'
-import { loadPolyfills } from './routes/_utils/polyfills/loadPolyfills'
-import { loadNonCriticalPolyfills } from './routes/_utils/polyfills/loadNonCriticalPolyfills'
-import { idbReady } from './routes/_utils/idbReady'
+import './routes/_utils/serviceWorkerClient.js'
+import './routes/_utils/historyEvents.js'
+import './routes/_utils/loadingMask.js'
+import './routes/_utils/forceOnline.js'
+import { mark, stop } from './routes/_utils/marks.js'
+import { loadPolyfills } from './routes/_utils/polyfills/loadPolyfills.js'
+import { loadNonCriticalPolyfills } from './routes/_utils/polyfills/loadNonCriticalPolyfills.js'
+import { idbReady } from './routes/_utils/idbReady.js'
 
 Promise.all([idbReady(), loadPolyfills()]).then(() => {
   mark('sapperStart')
@@ -17,6 +17,6 @@ Promise.all([idbReady(), loadPolyfills()]).then(() => {
 
 console.log('process.env.NODE_ENV', process.env.NODE_ENV)
 
-if (module.hot) {
-  module.hot.accept()
+if (import.meta.webpackHot) {
+  import.meta.webpackHot.accept()
 }
diff --git a/src/inline-script/inline-script.js b/src/inline-script/inline-script.js
index 32b7b3e4..8d6f914c 100644
--- a/src/inline-script/inline-script.js
+++ b/src/inline-script/inline-script.js
@@ -3,12 +3,12 @@
 // To allow CSP to work correctly, we also calculate a sha256 hash during
 // the build process and write it to checksum.js.
 
-import { INLINE_THEME, DEFAULT_THEME, switchToTheme } from '../routes/_utils/themeEngine'
-import { basename } from '../routes/_api/utils'
-import { onUserIsLoggedOut } from '../routes/_actions/onUserIsLoggedOut'
-import { storeLite } from '../routes/_store/storeLite'
-import { isIOSPre12Point2 } from '../routes/_utils/userAgent/isIOSPre12Point2'
-import { isMac } from '../routes/_utils/userAgent/isMac'
+import { INLINE_THEME, DEFAULT_THEME, switchToTheme } from '../routes/_utils/themeEngine.js'
+import { basename } from '../routes/_api/utils.js'
+import { onUserIsLoggedOut } from '../routes/_actions/onUserIsLoggedOut.js'
+import { storeLite } from '../routes/_store/storeLite.js'
+import { isIOSPre12Point2 } from '../routes/_utils/userAgent/isIOSPre12Point2.js'
+import { isMac } from '../routes/_utils/userAgent/isMac.js'
 
 window.__themeColors = process.env.THEME_COLORS
 
diff --git a/src/routes/_a11y/getAccessibleLabelForStatus.js b/src/routes/_a11y/getAccessibleLabelForStatus.js
index 62b8e5f8..18a4e574 100644
--- a/src/routes/_a11y/getAccessibleLabelForStatus.js
+++ b/src/routes/_a11y/getAccessibleLabelForStatus.js
@@ -1,6 +1,6 @@
-import { getAccountAccessibleName } from './getAccountAccessibleName'
-import { POST_PRIVACY_OPTIONS } from '../_static/statuses'
-import { formatIntl } from '../_utils/formatIntl'
+import { getAccountAccessibleName } from './getAccountAccessibleName.js'
+import { POST_PRIVACY_OPTIONS } from '../_static/statuses.js'
+import { formatIntl } from '../_utils/formatIntl.js'
 
 function getNotificationText (notification, omitEmojiInDisplayNames) {
   if (!notification) {
diff --git a/src/routes/_a11y/getAccountAccessibleName.js b/src/routes/_a11y/getAccountAccessibleName.js
index 81a30a1b..54e6685b 100644
--- a/src/routes/_a11y/getAccountAccessibleName.js
+++ b/src/routes/_a11y/getAccountAccessibleName.js
@@ -1,4 +1,4 @@
-import { removeEmoji } from '../_utils/removeEmoji'
+import { removeEmoji } from '../_utils/removeEmoji.js'
 
 export function getAccountAccessibleName (account, omitEmojiInDisplayNames) {
   const emojis = account.emojis
diff --git a/src/routes/_actions/accounts.js b/src/routes/_actions/accounts.js
index f9c50402..835c2ad9 100644
--- a/src/routes/_actions/accounts.js
+++ b/src/routes/_actions/accounts.js
@@ -1,7 +1,7 @@
-import { getAccount } from '../_api/user'
-import { getRelationship } from '../_api/relationships'
-import { database } from '../_database/database'
-import { store } from '../_store/store'
+import { getAccount } from '../_api/user.js'
+import { getRelationship } from '../_api/relationships.js'
+import { database } from '../_database/database.js'
+import { store } from '../_store/store.js'
 
 async function _updateAccount (accountId, instanceName, accessToken) {
   const localPromise = database.getAccount(instanceName, accountId)
diff --git a/src/routes/_actions/addInstance.js b/src/routes/_actions/addInstance.js
index ce5f6678..e3efdc9a 100644
--- a/src/routes/_actions/addInstance.js
+++ b/src/routes/_actions/addInstance.js
@@ -1,12 +1,12 @@
-import { getAccessTokenFromAuthCode, registerApplication, generateAuthLink } from '../_api/oauth'
-import { getInstanceInfo } from '../_api/instance'
-import { goto } from '../../../__sapper__/client'
-import { DEFAULT_THEME, switchToTheme } from '../_utils/themeEngine'
-import { store } from '../_store/store'
-import { updateVerifyCredentialsForInstance } from './instances'
-import { updateCustomEmojiForInstance } from './emoji'
-import { database } from '../_database/database'
-import { DOMAIN_BLOCKS } from '../_static/blocks'
+import { getAccessTokenFromAuthCode, registerApplication, generateAuthLink } from '../_api/oauth.js'
+import { getInstanceInfo } from '../_api/instance.js'
+import { goto } from '../../../__sapper__/client.js'
+import { DEFAULT_THEME, switchToTheme } from '../_utils/themeEngine.js'
+import { store } from '../_store/store.js'
+import { updateVerifyCredentialsForInstance } from './instances.js'
+import { updateCustomEmojiForInstance } from './emoji.js'
+import { database } from '../_database/database.js'
+import { DOMAIN_BLOCKS } from '../_static/blocks.js'
 
 const GENERIC_ERROR = `
   Is this a valid Mastodon instance? Is a browser extension
diff --git a/src/routes/_actions/addStatusOrNotification.js b/src/routes/_actions/addStatusOrNotification.js
index 76eb558c..2e772dbc 100644
--- a/src/routes/_actions/addStatusOrNotification.js
+++ b/src/routes/_actions/addStatusOrNotification.js
@@ -1,11 +1,10 @@
-import { mark, stop } from '../_utils/marks'
-import { store } from '../_store/store'
-import uniqBy from 'lodash-es/uniqBy'
-import isEqual from 'lodash-es/isEqual'
-import { database } from '../_database/database'
-import { concat } from '../_utils/arrays'
-import { scheduleIdleTask } from '../_utils/scheduleIdleTask'
-import { timelineItemToSummary } from '../_utils/timelineItemToSummary'
+import { mark, stop } from '../_utils/marks.js'
+import { store } from '../_store/store.js'
+import { uniqBy, isEqual } from '../_thirdparty/lodash/objects.js'
+import { database } from '../_database/database.js'
+import { concat } from '../_utils/arrays.js'
+import { scheduleIdleTask } from '../_utils/scheduleIdleTask.js'
+import { timelineItemToSummary } from '../_utils/timelineItemToSummary.js'
 
 function getExistingItemIdsSet (instanceName, timelineName) {
   const timelineItemSummaries = store.getForTimeline(instanceName, timelineName, 'timelineItemSummaries') || []
diff --git a/src/routes/_actions/autosuggest.js b/src/routes/_actions/autosuggest.js
index d4181e37..5a0951dc 100644
--- a/src/routes/_actions/autosuggest.js
+++ b/src/routes/_actions/autosuggest.js
@@ -1,4 +1,4 @@
-import { store } from '../_store/store'
+import { store } from '../_store/store.js'
 
 const emojiMapper = emoji => emoji.unicode ? emoji.unicode : `:${emoji.shortcodes[0]}:`
 const hashtagMapper = hashtag => `#${hashtag.name}`
diff --git a/src/routes/_actions/autosuggestAccountSearch.js b/src/routes/_actions/autosuggestAccountSearch.js
index c848d826..8eecb19b 100644
--- a/src/routes/_actions/autosuggestAccountSearch.js
+++ b/src/routes/_actions/autosuggestAccountSearch.js
@@ -1,11 +1,11 @@
-import { database } from '../_database/database'
-import { store } from '../_store/store'
-import { search } from '../_api/search'
-import { SEARCH_RESULTS_LIMIT } from '../_static/autosuggest'
-import { concat } from '../_utils/arrays'
-import uniqBy from 'lodash-es/uniqBy'
-import { scheduleIdleTask } from '../_utils/scheduleIdleTask'
-import { RequestThrottler } from '../_utils/RequestThrottler'
+import { database } from '../_database/database.js'
+import { store } from '../_store/store.js'
+import { search } from '../_api/search.js'
+import { SEARCH_RESULTS_LIMIT } from '../_static/autosuggest.js'
+import { concat } from '../_utils/arrays.js'
+import { uniqBy } from '../_thirdparty/lodash/objects.js'
+import { scheduleIdleTask } from '../_utils/scheduleIdleTask.js'
+import { RequestThrottler } from '../_utils/RequestThrottler.js'
 
 const DATABASE_SEARCH_RESULTS_LIMIT = 30
 
diff --git a/src/routes/_actions/autosuggestEmojiSearch.js b/src/routes/_actions/autosuggestEmojiSearch.js
index 81928932..853a5410 100644
--- a/src/routes/_actions/autosuggestEmojiSearch.js
+++ b/src/routes/_actions/autosuggestEmojiSearch.js
@@ -1,9 +1,9 @@
-import { store } from '../_store/store'
-import { scheduleIdleTask } from '../_utils/scheduleIdleTask'
-import * as emojiDatabase from '../_utils/emojiDatabase'
-import { SEARCH_RESULTS_LIMIT } from '../_static/autosuggest'
-import { testEmojiSupported } from '../_utils/testEmojiSupported'
-import { mark, stop } from '../_utils/marks'
+import { store } from '../_store/store.js'
+import { scheduleIdleTask } from '../_utils/scheduleIdleTask.js'
+import * as emojiDatabase from '../_utils/emojiDatabase.js'
+import { SEARCH_RESULTS_LIMIT } from '../_static/autosuggest.js'
+import { testEmojiSupported } from '../_utils/testEmojiSupported.js'
+import { mark, stop } from '../_utils/marks.js'
 
 async function searchEmoji (searchText) {
   let emojis = await emojiDatabase.findBySearchQuery(searchText)
diff --git a/src/routes/_actions/autosuggestHashtagSearch.js b/src/routes/_actions/autosuggestHashtagSearch.js
index 94576c4b..6b0847bc 100644
--- a/src/routes/_actions/autosuggestHashtagSearch.js
+++ b/src/routes/_actions/autosuggestHashtagSearch.js
@@ -1,9 +1,9 @@
-import { search } from '../_api/search'
-import { store } from '../_store/store'
-import { scheduleIdleTask } from '../_utils/scheduleIdleTask'
-import { SEARCH_RESULTS_LIMIT } from '../_static/autosuggest'
-import { RequestThrottler } from '../_utils/RequestThrottler'
-import { sum } from '../_utils/lodash-lite'
+import { search } from '../_api/search.js'
+import { store } from '../_store/store.js'
+import { scheduleIdleTask } from '../_utils/scheduleIdleTask.js'
+import { SEARCH_RESULTS_LIMIT } from '../_static/autosuggest.js'
+import { RequestThrottler } from '../_utils/RequestThrottler.js'
+import { sum } from '../_utils/lodash-lite.js'
 
 const HASHTAG_SEARCH_LIMIT = 10
 
diff --git a/src/routes/_actions/block.js b/src/routes/_actions/block.js
index 10409f61..7f53f654 100644
--- a/src/routes/_actions/block.js
+++ b/src/routes/_actions/block.js
@@ -1,9 +1,9 @@
-import { store } from '../_store/store'
-import { blockAccount, unblockAccount } from '../_api/block'
-import { toast } from '../_components/toast/toast'
-import { updateLocalRelationship } from './accounts'
-import { emit } from '../_utils/eventBus'
-import { formatIntl } from '../_utils/formatIntl'
+import { store } from '../_store/store.js'
+import { blockAccount, unblockAccount } from '../_api/block.js'
+import { toast } from '../_components/toast/toast.js'
+import { updateLocalRelationship } from './accounts.js'
+import { emit } from '../_utils/eventBus.js'
+import { formatIntl } from '../_utils/formatIntl.js'
 
 export async function setAccountBlocked (accountId, block, toastOnSuccess) {
   const { currentInstance, accessToken } = store.get()
diff --git a/src/routes/_actions/bookmark.js b/src/routes/_actions/bookmark.js
index 3759c03c..109d27f7 100644
--- a/src/routes/_actions/bookmark.js
+++ b/src/routes/_actions/bookmark.js
@@ -1,8 +1,8 @@
-import { store } from '../_store/store'
-import { toast } from '../_components/toast/toast'
-import { bookmarkStatus, unbookmarkStatus } from '../_api/bookmark'
-import { database } from '../_database/database'
-import { formatIntl } from '../_utils/formatIntl'
+import { store } from '../_store/store.js'
+import { toast } from '../_components/toast/toast.js'
+import { bookmarkStatus, unbookmarkStatus } from '../_api/bookmark.js'
+import { database } from '../_database/database.js'
+import { formatIntl } from '../_utils/formatIntl.js'
 
 export async function setStatusBookmarkedOrUnbookmarked (statusId, bookmarked) {
   const { currentInstance, accessToken } = store.get()
diff --git a/src/routes/_actions/compose.js b/src/routes/_actions/compose.js
index 74842d1b..d2451555 100644
--- a/src/routes/_actions/compose.js
+++ b/src/routes/_actions/compose.js
@@ -1,13 +1,13 @@
-import { store } from '../_store/store'
-import { toast } from '../_components/toast/toast'
-import { postStatus as postStatusToServer } from '../_api/statuses'
-import { addStatusOrNotification } from './addStatusOrNotification'
-import { database } from '../_database/database'
-import { emit } from '../_utils/eventBus'
-import { putMediaMetadata } from '../_api/media'
-import uniqBy from 'lodash-es/uniqBy'
-import { scheduleIdleTask } from '../_utils/scheduleIdleTask'
-import { formatIntl } from '../_utils/formatIntl'
+import { store } from '../_store/store.js'
+import { toast } from '../_components/toast/toast.js'
+import { postStatus as postStatusToServer } from '../_api/statuses.js'
+import { addStatusOrNotification } from './addStatusOrNotification.js'
+import { database } from '../_database/database.js'
+import { emit } from '../_utils/eventBus.js'
+import { putMediaMetadata } from '../_api/media.js'
+import { uniqBy } from '../_thirdparty/lodash/objects.js'
+import { scheduleIdleTask } from '../_utils/scheduleIdleTask.js'
+import { formatIntl } from '../_utils/formatIntl.js'
 
 export async function insertHandleForReply (statusId) {
   const { currentInstance } = store.get()
diff --git a/src/routes/_actions/composePoll.js b/src/routes/_actions/composePoll.js
index 020fe5a0..bfb9381e 100644
--- a/src/routes/_actions/composePoll.js
+++ b/src/routes/_actions/composePoll.js
@@ -1,4 +1,4 @@
-import { store } from '../_store/store'
+import { store } from '../_store/store.js'
 
 export function enablePoll (realm) {
   store.setComposeData(realm, {
diff --git a/src/routes/_actions/contentWarnings.js b/src/routes/_actions/contentWarnings.js
index f8463597..064d70f7 100644
--- a/src/routes/_actions/contentWarnings.js
+++ b/src/routes/_actions/contentWarnings.js
@@ -1,4 +1,4 @@
-import { store } from '../_store/store'
+import { store } from '../_store/store.js'
 
 export function toggleContentWarningShown (realm) {
   const shown = store.getComposeData(realm, 'contentWarningShown')
diff --git a/src/routes/_actions/copyText.js b/src/routes/_actions/copyText.js
index 4b3fcb0e..18963b29 100644
--- a/src/routes/_actions/copyText.js
+++ b/src/routes/_actions/copyText.js
@@ -1,5 +1,5 @@
 import { importShowCopyDialog } from '../_components/dialog/asyncDialogs/importShowCopyDialog.js'
-import { toast } from '../_components/toast/toast'
+import { toast } from '../_components/toast/toast.js'
 
 export async function copyText (text) {
   if (navigator.clipboard) { // not supported in all browsers
diff --git a/src/routes/_actions/createMakeProps.js b/src/routes/_actions/createMakeProps.js
index 7e372e07..e53ae926 100644
--- a/src/routes/_actions/createMakeProps.js
+++ b/src/routes/_actions/createMakeProps.js
@@ -1,9 +1,9 @@
-import { database } from '../_database/database'
-import { decode as decodeBlurhash, init as initBlurhash } from '../_utils/blurhash'
-import { mark, stop } from '../_utils/marks'
-import { get } from '../_utils/lodash-lite'
-import { statusHtmlToPlainText } from '../_utils/statusHtmlToPlainText'
-import { scheduleIdleTask } from '../_utils/scheduleIdleTask'
+import { database } from '../_database/database.js'
+import { decode as decodeBlurhash, init as initBlurhash } from '../_utils/blurhash.js'
+import { mark, stop } from '../_utils/marks.js'
+import { get } from '../_utils/lodash-lite.js'
+import { statusHtmlToPlainText } from '../_utils/statusHtmlToPlainText.js'
+import { scheduleIdleTask } from '../_utils/scheduleIdleTask.js'
 
 async function getNotification (instanceName, timelineType, timelineValue, itemId) {
   return {
diff --git a/src/routes/_actions/delete.js b/src/routes/_actions/delete.js
index 8e4a260a..c5d980ff 100644
--- a/src/routes/_actions/delete.js
+++ b/src/routes/_actions/delete.js
@@ -1,8 +1,8 @@
-import { store } from '../_store/store'
-import { deleteStatus } from '../_api/delete'
-import { toast } from '../_components/toast/toast'
-import { deleteStatus as deleteStatusLocally } from './deleteStatuses'
-import { formatIntl } from '../_utils/formatIntl'
+import { store } from '../_store/store.js'
+import { deleteStatus } from '../_api/delete.js'
+import { toast } from '../_components/toast/toast.js'
+import { deleteStatus as deleteStatusLocally } from './deleteStatuses.js'
+import { formatIntl } from '../_utils/formatIntl.js'
 
 export async function doDeleteStatus (statusId) {
   const { currentInstance, accessToken } = store.get()
diff --git a/src/routes/_actions/deleteAndRedraft.js b/src/routes/_actions/deleteAndRedraft.js
index a2b4b7b4..d57c65bf 100644
--- a/src/routes/_actions/deleteAndRedraft.js
+++ b/src/routes/_actions/deleteAndRedraft.js
@@ -1,7 +1,7 @@
-import { statusHtmlToPlainText } from '../_utils/statusHtmlToPlainText'
+import { statusHtmlToPlainText } from '../_utils/statusHtmlToPlainText.js'
 import { importShowComposeDialog } from '../_components/dialog/asyncDialogs/importShowComposeDialog.js'
-import { doDeleteStatus } from './delete'
-import { store } from '../_store/store'
+import { doDeleteStatus } from './delete.js'
+import { store } from '../_store/store.js'
 
 export async function deleteAndRedraft (status) {
   const deleteStatusPromise = doDeleteStatus(status.id)
diff --git a/src/routes/_actions/deleteStatuses.js b/src/routes/_actions/deleteStatuses.js
index e6ed6efd..08f613be 100644
--- a/src/routes/_actions/deleteStatuses.js
+++ b/src/routes/_actions/deleteStatuses.js
@@ -1,8 +1,8 @@
-import { getIdsThatRebloggedThisStatus, getNotificationIdsForStatuses } from './statuses'
-import { store } from '../_store/store'
-import isEqual from 'lodash-es/isEqual'
-import { database } from '../_database/database'
-import { scheduleIdleTask } from '../_utils/scheduleIdleTask'
+import { getIdsThatRebloggedThisStatus, getNotificationIdsForStatuses } from './statuses.js'
+import { store } from '../_store/store.js'
+import { isEqual } from '../_thirdparty/lodash/objects.js'
+import { database } from '../_database/database.js'
+import { scheduleIdleTask } from '../_utils/scheduleIdleTask.js'
 
 function filterItemIdsFromTimelines (instanceName, timelineFilter, idFilter) {
   const keys = ['timelineItemSummaries', 'timelineItemSummariesToAdd']
diff --git a/src/routes/_actions/doQuickLoginIfNecessary.js b/src/routes/_actions/doQuickLoginIfNecessary.js
index 8f297151..2df02c90 100644
--- a/src/routes/_actions/doQuickLoginIfNecessary.js
+++ b/src/routes/_actions/doQuickLoginIfNecessary.js
@@ -2,8 +2,8 @@
 // Used in the integration tests. Can't see a problem with exposing this publicly
 // since you would have to know the access token anyway.
 
-import { store } from '../_store/store'
-import { goto } from '../../../__sapper__/client'
+import { store } from '../_store/store.js'
+import { goto } from '../../../__sapper__/client.js'
 
 export function doQuickLoginIfNecessary () {
   const params = new URLSearchParams(location.search)
diff --git a/src/routes/_actions/emoji.js b/src/routes/_actions/emoji.js
index 81888f4a..a45d182a 100644
--- a/src/routes/_actions/emoji.js
+++ b/src/routes/_actions/emoji.js
@@ -1,11 +1,11 @@
 import {
   cacheFirstUpdateAfter,
   cacheFirstUpdateOnlyIfNotInCache
-} from '../_utils/sync'
-import { database } from '../_database/database'
-import { getCustomEmoji } from '../_api/emoji'
-import { store } from '../_store/store'
-import isEqual from 'lodash-es/isEqual'
+} from '../_utils/sync.js'
+import { database } from '../_database/database.js'
+import { getCustomEmoji } from '../_api/emoji.js'
+import { store } from '../_store/store.js'
+import { isEqual } from '../_thirdparty/lodash/objects.js'
 
 async function syncEmojiForInstance (instanceName, syncMethod) {
   await syncMethod(
diff --git a/src/routes/_actions/favorite.js b/src/routes/_actions/favorite.js
index c8d43958..2291a18e 100644
--- a/src/routes/_actions/favorite.js
+++ b/src/routes/_actions/favorite.js
@@ -1,8 +1,8 @@
-import { favoriteStatus, unfavoriteStatus } from '../_api/favorite'
-import { store } from '../_store/store'
-import { toast } from '../_components/toast/toast'
-import { database } from '../_database/database'
-import { formatIntl } from '../_utils/formatIntl'
+import { favoriteStatus, unfavoriteStatus } from '../_api/favorite.js'
+import { store } from '../_store/store.js'
+import { toast } from '../_components/toast/toast.js'
+import { database } from '../_database/database.js'
+import { formatIntl } from '../_utils/formatIntl.js'
 
 export async function setFavorited (statusId, favorited) {
   const { online } = store.get()
diff --git a/src/routes/_actions/filters.js b/src/routes/_actions/filters.js
index d59ca455..9f96f4c6 100644
--- a/src/routes/_actions/filters.js
+++ b/src/routes/_actions/filters.js
@@ -1,11 +1,11 @@
-import { store } from '../_store/store'
-import { createFilter, getFilters, updateFilter, deleteFilter as doDeleteFilter } from '../_api/filters'
-import { cacheFirstUpdateAfter, cacheFirstUpdateOnlyIfNotInCache } from '../_utils/sync'
-import { database } from '../_database/database'
-import { isEqual } from 'lodash-es'
-import { toast } from '../_components/toast/toast'
-import { formatIntl } from '../_utils/formatIntl'
-import { emit } from '../_utils/eventBus'
+import { store } from '../_store/store.js'
+import { createFilter, getFilters, updateFilter, deleteFilter as doDeleteFilter } from '../_api/filters.js'
+import { cacheFirstUpdateAfter, cacheFirstUpdateOnlyIfNotInCache } from '../_utils/sync.js'
+import { database } from '../_database/database.js'
+import { isEqual } from '../_thirdparty/lodash/objects.js'
+import { toast } from '../_components/toast/toast.js'
+import { formatIntl } from '../_utils/formatIntl.js'
+import { emit } from '../_utils/eventBus.js'
 
 async function syncFilters (instanceName, syncMethod) {
   const { loggedInInstances } = store.get()
diff --git a/src/routes/_actions/follow.js b/src/routes/_actions/follow.js
index e1eed3c0..59aa466a 100644
--- a/src/routes/_actions/follow.js
+++ b/src/routes/_actions/follow.js
@@ -1,8 +1,8 @@
-import { store } from '../_store/store'
-import { followAccount, unfollowAccount } from '../_api/follow'
-import { toast } from '../_components/toast/toast'
-import { updateLocalRelationship } from './accounts'
-import { formatIntl } from '../_utils/formatIntl'
+import { store } from '../_store/store.js'
+import { followAccount, unfollowAccount } from '../_api/follow.js'
+import { toast } from '../_components/toast/toast.js'
+import { updateLocalRelationship } from './accounts.js'
+import { formatIntl } from '../_utils/formatIntl.js'
 
 export async function setAccountFollowed (accountId, follow, toastOnSuccess) {
   const { currentInstance, accessToken } = store.get()
diff --git a/src/routes/_actions/followRequests.js b/src/routes/_actions/followRequests.js
index b2edcab2..d65c83fc 100644
--- a/src/routes/_actions/followRequests.js
+++ b/src/routes/_actions/followRequests.js
@@ -1,8 +1,8 @@
-import { store } from '../_store/store'
-import { cacheFirstUpdateAfter } from '../_utils/sync'
-import { database } from '../_database/database'
-import { getFollowRequests } from '../_api/followRequests'
-import { get } from '../_utils/lodash-lite'
+import { store } from '../_store/store.js'
+import { cacheFirstUpdateAfter } from '../_utils/sync.js'
+import { database } from '../_database/database.js'
+import { getFollowRequests } from '../_api/followRequests.js'
+import { get } from '../_utils/lodash-lite.js'
 
 export async function updateFollowRequestCountIfLockedAccount (instanceName) {
   const { verifyCredentials, loggedInInstances } = store.get()
diff --git a/src/routes/_actions/getRecentStatusesForAccount.js b/src/routes/_actions/getRecentStatusesForAccount.js
index 8c64a914..3feee6f7 100644
--- a/src/routes/_actions/getRecentStatusesForAccount.js
+++ b/src/routes/_actions/getRecentStatusesForAccount.js
@@ -1,5 +1,5 @@
-import { store } from '../_store/store'
-import { getTimeline } from '../_api/timelines'
+import { store } from '../_store/store.js'
+import { getTimeline } from '../_api/timelines.js'
 
 export async function getRecentStatusesForAccount (accountId) {
   const { currentInstance, accessToken } = store.get()
diff --git a/src/routes/_actions/goToSearch.js b/src/routes/_actions/goToSearch.js
index 264ac4fc..664618ca 100644
--- a/src/routes/_actions/goToSearch.js
+++ b/src/routes/_actions/goToSearch.js
@@ -1,6 +1,6 @@
-import { store } from '../_store/store'
-import { goto } from '../../../__sapper__/client'
-import { emit } from '../_utils/eventBus'
+import { store } from '../_store/store.js'
+import { goto } from '../../../__sapper__/client.js'
+import { emit } from '../_utils/eventBus.js'
 
 // Go to the search page, and also focus the search input. For accessibility
 // and usability reasons, this only happens on pressing these particular hotkeys.
diff --git a/src/routes/_actions/instances.js b/src/routes/_actions/instances.js
index a1812af8..a9f7df8a 100644
--- a/src/routes/_actions/instances.js
+++ b/src/routes/_actions/instances.js
@@ -1,13 +1,13 @@
-import { getVerifyCredentials } from '../_api/user'
-import { store } from '../_store/store'
-import { switchToTheme } from '../_utils/themeEngine'
-import { toast } from '../_components/toast/toast'
-import { goto } from '../../../__sapper__/client'
-import { cacheFirstUpdateAfter } from '../_utils/sync'
-import { getInstanceInfo } from '../_api/instance'
-import { database } from '../_database/database'
+import { getVerifyCredentials } from '../_api/user.js'
+import { store } from '../_store/store.js'
+import { switchToTheme } from '../_utils/themeEngine.js'
+import { toast } from '../_components/toast/toast.js'
+import { goto } from '../../../__sapper__/client.js'
+import { cacheFirstUpdateAfter } from '../_utils/sync.js'
+import { getInstanceInfo } from '../_api/instance.js'
+import { database } from '../_database/database.js'
 import { importVirtualListStore } from '../_utils/asyncModules/importVirtualListStore.js'
-import { formatIntl } from '../_utils/formatIntl'
+import { formatIntl } from '../_utils/formatIntl.js'
 
 export function changeTheme (instanceName, newTheme) {
   const { instanceThemes } = store.get()
diff --git a/src/routes/_actions/lists.js b/src/routes/_actions/lists.js
index 96a04c82..7c7366d1 100644
--- a/src/routes/_actions/lists.js
+++ b/src/routes/_actions/lists.js
@@ -1,7 +1,7 @@
-import { store } from '../_store/store'
-import { getLists } from '../_api/lists'
-import { cacheFirstUpdateAfter, cacheFirstUpdateOnlyIfNotInCache } from '../_utils/sync'
-import { database } from '../_database/database'
+import { store } from '../_store/store.js'
+import { getLists } from '../_api/lists.js'
+import { cacheFirstUpdateAfter, cacheFirstUpdateOnlyIfNotInCache } from '../_utils/sync.js'
+import { database } from '../_database/database.js'
 
 async function syncLists (instanceName, syncMethod) {
   const { loggedInInstances } = store.get()
diff --git a/src/routes/_actions/media.js b/src/routes/_actions/media.js
index 48e3f363..56f5e324 100644
--- a/src/routes/_actions/media.js
+++ b/src/routes/_actions/media.js
@@ -1,9 +1,9 @@
-import { store } from '../_store/store'
-import { uploadMedia } from '../_api/media'
-import { toast } from '../_components/toast/toast'
-import { scheduleIdleTask } from '../_utils/scheduleIdleTask'
-import { formatIntl } from '../_utils/formatIntl'
-import { database } from '../_database/database'
+import { store } from '../_store/store.js'
+import { uploadMedia } from '../_api/media.js'
+import { toast } from '../_components/toast/toast.js'
+import { scheduleIdleTask } from '../_utils/scheduleIdleTask.js'
+import { formatIntl } from '../_utils/formatIntl.js'
+import { database } from '../_database/database.js'
 
 export async function doMediaUpload (realm, file) {
   const { currentInstance, accessToken } = store.get()
diff --git a/src/routes/_actions/mention.js b/src/routes/_actions/mention.js
index db70522b..ba4b41c5 100644
--- a/src/routes/_actions/mention.js
+++ b/src/routes/_actions/mention.js
@@ -1,5 +1,5 @@
 import { importShowComposeDialog } from '../_components/dialog/asyncDialogs/importShowComposeDialog.js'
-import { store } from '../_store/store'
+import { store } from '../_store/store.js'
 
 export async function composeNewStatusMentioning (account) {
   store.setComposeData('dialog', { text: `@${account.acct} ` })
diff --git a/src/routes/_actions/mute.js b/src/routes/_actions/mute.js
index d4bbe531..765ecd64 100644
--- a/src/routes/_actions/mute.js
+++ b/src/routes/_actions/mute.js
@@ -1,9 +1,9 @@
-import { store } from '../_store/store'
-import { muteAccount, unmuteAccount } from '../_api/mute'
-import { toast } from '../_components/toast/toast'
-import { updateLocalRelationship } from './accounts'
-import { emit } from '../_utils/eventBus'
-import { formatIntl } from '../_utils/formatIntl'
+import { store } from '../_store/store.js'
+import { muteAccount, unmuteAccount } from '../_api/mute.js'
+import { toast } from '../_components/toast/toast.js'
+import { updateLocalRelationship } from './accounts.js'
+import { emit } from '../_utils/eventBus.js'
+import { formatIntl } from '../_utils/formatIntl.js'
 
 export async function setAccountMuted (accountId, mute, notifications, toastOnSuccess) {
   const { currentInstance, accessToken } = store.get()
diff --git a/src/routes/_actions/muteConversation.js b/src/routes/_actions/muteConversation.js
index 2b3df5b2..c52da6f4 100644
--- a/src/routes/_actions/muteConversation.js
+++ b/src/routes/_actions/muteConversation.js
@@ -1,8 +1,8 @@
-import { store } from '../_store/store'
-import { muteConversation, unmuteConversation } from '../_api/muteConversation'
-import { toast } from '../_components/toast/toast'
-import { database } from '../_database/database'
-import { formatIntl } from '../_utils/formatIntl'
+import { store } from '../_store/store.js'
+import { muteConversation, unmuteConversation } from '../_api/muteConversation.js'
+import { toast } from '../_components/toast/toast.js'
+import { database } from '../_database/database.js'
+import { formatIntl } from '../_utils/formatIntl.js'
 
 export async function setConversationMuted (statusId, mute, toastOnSuccess) {
   const { currentInstance, accessToken } = store.get()
diff --git a/src/routes/_actions/pin.js b/src/routes/_actions/pin.js
index 3d44afc0..3aba62f5 100644
--- a/src/routes/_actions/pin.js
+++ b/src/routes/_actions/pin.js
@@ -1,9 +1,9 @@
-import { store } from '../_store/store'
-import { toast } from '../_components/toast/toast'
-import { pinStatus, unpinStatus } from '../_api/pin'
-import { database } from '../_database/database'
-import { emit } from '../_utils/eventBus'
-import { formatIntl } from '../_utils/formatIntl'
+import { store } from '../_store/store.js'
+import { toast } from '../_components/toast/toast.js'
+import { pinStatus, unpinStatus } from '../_api/pin.js'
+import { database } from '../_database/database.js'
+import { emit } from '../_utils/eventBus.js'
+import { formatIntl } from '../_utils/formatIntl.js'
 
 export async function setStatusPinnedOrUnpinned (statusId, pinned, toastOnSuccess) {
   const { currentInstance, accessToken } = store.get()
diff --git a/src/routes/_actions/pinnedStatuses.js b/src/routes/_actions/pinnedStatuses.js
index f38f5c58..7c4db7ab 100644
--- a/src/routes/_actions/pinnedStatuses.js
+++ b/src/routes/_actions/pinnedStatuses.js
@@ -1,9 +1,9 @@
-import { store } from '../_store/store'
-import { cacheFirstUpdateAfter } from '../_utils/sync'
-import { database } from '../_database/database'
+import { store } from '../_store/store.js'
+import { cacheFirstUpdateAfter } from '../_utils/sync.js'
+import { database } from '../_database/database.js'
 import {
   getPinnedStatuses
-} from '../_api/pinnedStatuses'
+} from '../_api/pinnedStatuses.js'
 
 export async function updatePinnedStatusesForAccount (accountId) {
   const { currentInstance, accessToken } = store.get()
diff --git a/src/routes/_actions/polls.js b/src/routes/_actions/polls.js
index aba6173a..a0fc6418 100644
--- a/src/routes/_actions/polls.js
+++ b/src/routes/_actions/polls.js
@@ -1,7 +1,7 @@
-import { getPoll as getPollApi, voteOnPoll as voteOnPollApi } from '../_api/polls'
-import { store } from '../_store/store'
-import { toast } from '../_components/toast/toast'
-import { formatIntl } from '../_utils/formatIntl'
+import { getPoll as getPollApi, voteOnPoll as voteOnPollApi } from '../_api/polls.js'
+import { store } from '../_store/store.js'
+import { toast } from '../_components/toast/toast.js'
+import { formatIntl } from '../_utils/formatIntl.js'
 
 export async function getPoll (pollId) {
   const { currentInstance, accessToken } = store.get()
diff --git a/src/routes/_actions/postPrivacy.js b/src/routes/_actions/postPrivacy.js
index a9468797..98db7ffa 100644
--- a/src/routes/_actions/postPrivacy.js
+++ b/src/routes/_actions/postPrivacy.js
@@ -1,5 +1,5 @@
 
-import { store } from '../_store/store'
+import { store } from '../_store/store.js'
 
 export function setPostPrivacy (realm, postPrivacyKey) {
   store.setComposeData(realm, { postPrivacy: postPrivacyKey })
diff --git a/src/routes/_actions/pushSubscription.js b/src/routes/_actions/pushSubscription.js
index f4b07631..28f4ee49 100644
--- a/src/routes/_actions/pushSubscription.js
+++ b/src/routes/_actions/pushSubscription.js
@@ -1,6 +1,6 @@
-import { getSubscription, deleteSubscription, postSubscription, putSubscription } from '../_api/pushSubscription'
-import { store } from '../_store/store'
-import { urlBase64ToUint8Array } from '../_utils/base64'
+import { getSubscription, deleteSubscription, postSubscription, putSubscription } from '../_api/pushSubscription.js'
+import { store } from '../_store/store.js'
+import { urlBase64ToUint8Array } from '../_utils/base64.js'
 
 const dummyApplicationServerKey = 'BImgAz4cF_yvNFp8uoBJCaGpCX4d0atNIFMHfBvAAXCyrnn9IMAFQ10DW_ZvBCzGeR4fZI5FnEi2JVcRE-L88jY='
 
diff --git a/src/routes/_actions/reblog.js b/src/routes/_actions/reblog.js
index ba9a24d9..b2268b32 100644
--- a/src/routes/_actions/reblog.js
+++ b/src/routes/_actions/reblog.js
@@ -1,8 +1,8 @@
-import { store } from '../_store/store'
-import { toast } from '../_components/toast/toast'
-import { reblogStatus, unreblogStatus } from '../_api/reblog'
-import { database } from '../_database/database'
-import { formatIntl } from '../_utils/formatIntl'
+import { store } from '../_store/store.js'
+import { toast } from '../_components/toast/toast.js'
+import { reblogStatus, unreblogStatus } from '../_api/reblog.js'
+import { database } from '../_database/database.js'
+import { formatIntl } from '../_utils/formatIntl.js'
 
 export async function setReblogged (statusId, reblogged) {
   const online = store.get()
diff --git a/src/routes/_actions/reportStatuses.js b/src/routes/_actions/reportStatuses.js
index 67e6c76f..e3a4f288 100644
--- a/src/routes/_actions/reportStatuses.js
+++ b/src/routes/_actions/reportStatuses.js
@@ -1,7 +1,7 @@
-import { store } from '../_store/store'
-import { toast } from '../_components/toast/toast'
-import { report } from '../_api/report'
-import { formatIntl } from '../_utils/formatIntl'
+import { store } from '../_store/store.js'
+import { toast } from '../_components/toast/toast.js'
+import { report } from '../_api/report.js'
+import { formatIntl } from '../_utils/formatIntl.js'
 
 export async function reportStatuses (account, statusIds, comment, forward) {
   const { currentInstance, accessToken } = store.get()
diff --git a/src/routes/_actions/requests.js b/src/routes/_actions/requests.js
index ad763ade..1697c827 100644
--- a/src/routes/_actions/requests.js
+++ b/src/routes/_actions/requests.js
@@ -1,8 +1,8 @@
-import { store } from '../_store/store'
-import { approveFollowRequest, rejectFollowRequest } from '../_api/requests'
-import { emit } from '../_utils/eventBus'
-import { toast } from '../_components/toast/toast'
-import { formatIntl } from '../_utils/formatIntl'
+import { store } from '../_store/store.js'
+import { approveFollowRequest, rejectFollowRequest } from '../_api/requests.js'
+import { emit } from '../_utils/eventBus.js'
+import { toast } from '../_components/toast/toast.js'
+import { formatIntl } from '../_utils/formatIntl.js'
 
 export async function setFollowRequestApprovedOrRejected (accountId, approved, toastOnSuccess) {
   const {
diff --git a/src/routes/_actions/search.js b/src/routes/_actions/search.js
index 43b057ad..3de3a52c 100644
--- a/src/routes/_actions/search.js
+++ b/src/routes/_actions/search.js
@@ -1,7 +1,7 @@
-import { store } from '../_store/store'
-import { toast } from '../_components/toast/toast'
-import { search } from '../_api/search'
-import { formatIntl } from '../_utils/formatIntl'
+import { store } from '../_store/store.js'
+import { toast } from '../_components/toast/toast.js'
+import { search } from '../_api/search.js'
+import { formatIntl } from '../_utils/formatIntl.js'
 
 export async function doSearch () {
   const { currentInstance, accessToken, queryInSearch } = store.get()
diff --git a/src/routes/_actions/setDomainBlocked.js b/src/routes/_actions/setDomainBlocked.js
index ff5ac0ef..970bd4cd 100644
--- a/src/routes/_actions/setDomainBlocked.js
+++ b/src/routes/_actions/setDomainBlocked.js
@@ -1,8 +1,8 @@
-import { store } from '../_store/store'
-import { blockDomain, unblockDomain } from '../_api/blockDomain'
-import { toast } from '../_components/toast/toast'
-import { updateRelationship } from './accounts'
-import { formatIntl } from '../_utils/formatIntl'
+import { store } from '../_store/store.js'
+import { blockDomain, unblockDomain } from '../_api/blockDomain.js'
+import { toast } from '../_components/toast/toast.js'
+import { updateRelationship } from './accounts.js'
+import { formatIntl } from '../_utils/formatIntl.js'
 
 export async function setDomainBlocked (accountId, domain, block, toastOnSuccess) {
   const { currentInstance, accessToken } = store.get()
diff --git a/src/routes/_actions/setShowReblogs.js b/src/routes/_actions/setShowReblogs.js
index 9f00afa1..aab36801 100644
--- a/src/routes/_actions/setShowReblogs.js
+++ b/src/routes/_actions/setShowReblogs.js
@@ -1,8 +1,8 @@
-import { store } from '../_store/store'
-import { setShowReblogs as setShowReblogsApi } from '../_api/showReblogs'
-import { toast } from '../_components/toast/toast'
-import { updateLocalRelationship } from './accounts'
-import { formatIntl } from '../_utils/formatIntl'
+import { store } from '../_store/store.js'
+import { setShowReblogs as setShowReblogsApi } from '../_api/showReblogs.js'
+import { toast } from '../_components/toast/toast.js'
+import { updateLocalRelationship } from './accounts.js'
+import { formatIntl } from '../_utils/formatIntl.js'
 
 export async function setShowReblogs (accountId, showReblogs, toastOnSuccess) {
   const { currentInstance, accessToken } = store.get()
diff --git a/src/routes/_actions/share.js b/src/routes/_actions/share.js
index 38cbdbfe..8e3a6d77 100644
--- a/src/routes/_actions/share.js
+++ b/src/routes/_actions/share.js
@@ -1,6 +1,6 @@
-import { toast } from '../_components/toast/toast'
-import { statusHtmlToPlainText } from '../_utils/statusHtmlToPlainText'
-import { formatIntl } from '../_utils/formatIntl'
+import { toast } from '../_components/toast/toast.js'
+import { statusHtmlToPlainText } from '../_utils/statusHtmlToPlainText.js'
+import { formatIntl } from '../_utils/formatIntl.js'
 
 export async function shareStatus (status) {
   try {
diff --git a/src/routes/_actions/showComposeDialog.js b/src/routes/_actions/showComposeDialog.js
index da167191..8886c89d 100644
--- a/src/routes/_actions/showComposeDialog.js
+++ b/src/routes/_actions/showComposeDialog.js
@@ -1,7 +1,7 @@
-import { store } from '../_store/store'
-import { importShowComposeDialog } from '../_components/dialog/asyncDialogs/importShowComposeDialog'
-import { database } from '../_database/database'
-import { doMediaUpload } from './media'
+import { store } from '../_store/store.js'
+import { importShowComposeDialog } from '../_components/dialog/asyncDialogs/importShowComposeDialog.js'
+import { database } from '../_database/database.js'
+import { doMediaUpload } from './media.js'
 
 // show a compose dialog, typically invoked by the Web Share API or a PWA shortcut
 export async function showComposeDialog () {
diff --git a/src/routes/_actions/showMoreAndScrollToTop.js b/src/routes/_actions/showMoreAndScrollToTop.js
index d1450cd1..6793c75d 100644
--- a/src/routes/_actions/showMoreAndScrollToTop.js
+++ b/src/routes/_actions/showMoreAndScrollToTop.js
@@ -1,8 +1,8 @@
-import { showMoreItemsForCurrentTimeline } from './timeline'
-import { scrollToTop } from '../_utils/scrollToTop'
-import { createStatusOrNotificationUuid } from '../_utils/createStatusOrNotificationUuid'
-import { store } from '../_store/store'
-import { tryToFocusElement } from '../_utils/tryToFocusElement'
+import { showMoreItemsForCurrentTimeline } from './timeline.js'
+import { scrollToTop } from '../_utils/scrollToTop.js'
+import { createStatusOrNotificationUuid } from '../_utils/createStatusOrNotificationUuid.js'
+import { store } from '../_store/store.js'
+import { tryToFocusElement } from '../_utils/tryToFocusElement.js'
 
 export function showMoreAndScrollToTop () {
   // Similar to Twitter, pressing "." will click the "show more" button and select
diff --git a/src/routes/_actions/statuses.js b/src/routes/_actions/statuses.js
index 295e307f..990a783d 100644
--- a/src/routes/_actions/statuses.js
+++ b/src/routes/_actions/statuses.js
@@ -1,4 +1,4 @@
-import { database } from '../_database/database'
+import { database } from '../_database/database.js'
 
 export async function getIdThatThisStatusReblogged (instanceName, statusId) {
   const status = await database.getStatus(instanceName, statusId)
diff --git a/src/routes/_actions/stream/fillStreamingGap.js b/src/routes/_actions/stream/fillStreamingGap.js
index a34550f6..355dd559 100644
--- a/src/routes/_actions/stream/fillStreamingGap.js
+++ b/src/routes/_actions/stream/fillStreamingGap.js
@@ -1,5 +1,5 @@
-import { addStatusesOrNotifications } from '../addStatusOrNotification'
-import { getTimeline } from '../../_api/timelines'
+import { addStatusesOrNotifications } from '../addStatusOrNotification.js'
+import { getTimeline } from '../../_api/timelines.js'
 
 const TIMELINE_GAP_BATCH_SIZE = 20 // Mastodon timeline API maximum limit
 const MAX_NUM_REQUESTS = 15 // to avoid getting caught in an infinite loop somehow
diff --git a/src/routes/_actions/stream/processMessage.js b/src/routes/_actions/stream/processMessage.js
index 4e66a052..63bcac6e 100644
--- a/src/routes/_actions/stream/processMessage.js
+++ b/src/routes/_actions/stream/processMessage.js
@@ -1,7 +1,7 @@
-import { mark, stop } from '../../_utils/marks'
-import { deleteStatus } from '../deleteStatuses'
-import { addStatusOrNotification } from '../addStatusOrNotification'
-import { emit } from '../../_utils/eventBus'
+import { mark, stop } from '../../_utils/marks.js'
+import { deleteStatus } from '../deleteStatuses.js'
+import { addStatusOrNotification } from '../addStatusOrNotification.js'
+import { emit } from '../../_utils/eventBus.js'
 
 const KNOWN_EVENTS = ['update', 'delete', 'notification', 'conversation', 'filters_changed']
 
diff --git a/src/routes/_actions/stream/streaming.js b/src/routes/_actions/stream/streaming.js
index 61cd45ac..e2dce402 100644
--- a/src/routes/_actions/stream/streaming.js
+++ b/src/routes/_actions/stream/streaming.js
@@ -1,7 +1,7 @@
-import { TimelineStream } from '../../_api/stream/TimelineStream'
-import { processMessage } from './processMessage'
-import { fillStreamingGap } from './fillStreamingGap'
-import { store } from '../../_store/store'
+import { TimelineStream } from '../../_api/stream/TimelineStream.js'
+import { processMessage } from './processMessage.js'
+import { fillStreamingGap } from './fillStreamingGap.js'
+import { store } from '../../_store/store.js'
 
 export function createStream (api, instanceName, accessToken, timelineName, firstStatusId, firstNotificationId) {
   console.log(`streaming ${instanceName} ${timelineName}: createStream`, 'firstStatusId', firstStatusId,
diff --git a/src/routes/_actions/timeline.js b/src/routes/_actions/timeline.js
index 900fabfc..6eabed10 100644
--- a/src/routes/_actions/timeline.js
+++ b/src/routes/_actions/timeline.js
@@ -1,19 +1,18 @@
-import { store } from '../_store/store'
-import { getTimeline } from '../_api/timelines'
-import { toast } from '../_components/toast/toast'
-import { mark, stop } from '../_utils/marks'
-import { concat, mergeArrays } from '../_utils/arrays'
-import { compareTimelineItemSummaries } from '../_utils/statusIdSorting'
-import isEqual from 'lodash-es/isEqual'
-import { database } from '../_database/database'
-import { getStatus, getStatusContext } from '../_api/statuses'
-import { emit } from '../_utils/eventBus'
-import { TIMELINE_BATCH_SIZE } from '../_static/timelines'
-import { timelineItemToSummary } from '../_utils/timelineItemToSummary'
-import uniqBy from 'lodash-es/uniqBy'
-import { addStatusesOrNotifications } from './addStatusOrNotification'
-import { scheduleIdleTask } from '../_utils/scheduleIdleTask'
-import { sortItemSummariesForThread } from '../_utils/sortItemSummariesForThread'
+import { store } from '../_store/store.js'
+import { getTimeline } from '../_api/timelines.js'
+import { toast } from '../_components/toast/toast.js'
+import { mark, stop } from '../_utils/marks.js'
+import { concat, mergeArrays } from '../_utils/arrays.js'
+import { compareTimelineItemSummaries } from '../_utils/statusIdSorting.js'
+import { uniqBy, isEqual } from '../_thirdparty/lodash/objects.js'
+import { database } from '../_database/database.js'
+import { getStatus, getStatusContext } from '../_api/statuses.js'
+import { emit } from '../_utils/eventBus.js'
+import { TIMELINE_BATCH_SIZE } from '../_static/timelines.js'
+import { timelineItemToSummary } from '../_utils/timelineItemToSummary.js'
+import { addStatusesOrNotifications } from './addStatusOrNotification.js'
+import { scheduleIdleTask } from '../_utils/scheduleIdleTask.js'
+import { sortItemSummariesForThread } from '../_utils/sortItemSummariesForThread.js'
 import li from 'li'
 
 const byId = _ => _.id
diff --git a/src/routes/_actions/toggleMute.js b/src/routes/_actions/toggleMute.js
index d4387f67..9ceb5550 100644
--- a/src/routes/_actions/toggleMute.js
+++ b/src/routes/_actions/toggleMute.js
@@ -1,5 +1,5 @@
 import { importShowMuteDialog } from '../_components/dialog/asyncDialogs/importShowMuteDialog.js'
-import { setAccountMuted } from './mute'
+import { setAccountMuted } from './mute.js'
 
 export async function toggleMute (account, mute) {
   if (mute) {
diff --git a/src/routes/_api/block.js b/src/routes/_api/block.js
index 730d0c3c..8afb5306 100644
--- a/src/routes/_api/block.js
+++ b/src/routes/_api/block.js
@@ -1,5 +1,5 @@
-import { auth, basename } from './utils'
-import { post, WRITE_TIMEOUT } from '../_utils/ajax'
+import { auth, basename } from './utils.js'
+import { post, WRITE_TIMEOUT } from '../_utils/ajax.js'
 
 export async function blockAccount (instanceName, accessToken, accountId) {
   const url = `${basename(instanceName)}/api/v1/accounts/${accountId}/block`
diff --git a/src/routes/_api/blockDomain.js b/src/routes/_api/blockDomain.js
index ae022e95..e44dd7b4 100644
--- a/src/routes/_api/blockDomain.js
+++ b/src/routes/_api/blockDomain.js
@@ -1,5 +1,5 @@
-import { post, WRITE_TIMEOUT, paramsString, del } from '../_utils/ajax'
-import { auth, basename } from './utils'
+import { post, WRITE_TIMEOUT, paramsString, del } from '../_utils/ajax.js'
+import { auth, basename } from './utils.js'
 
 export async function blockDomain (instanceName, accessToken, domain) {
   const url = `${basename(instanceName)}/api/v1/domain_blocks?${paramsString({ domain })}`
diff --git a/src/routes/_api/blockedAndMuted.js b/src/routes/_api/blockedAndMuted.js
index 1928c02b..fe2ade66 100644
--- a/src/routes/_api/blockedAndMuted.js
+++ b/src/routes/_api/blockedAndMuted.js
@@ -1,5 +1,5 @@
-import { DEFAULT_TIMEOUT, get, paramsString } from '../_utils/ajax'
-import { auth, basename } from './utils'
+import { DEFAULT_TIMEOUT, get, paramsString } from '../_utils/ajax.js'
+import { auth, basename } from './utils.js'
 
 export async function getBlockedAccounts (instanceName, accessToken, limit = 80) {
   let url = `${basename(instanceName)}/api/v1/blocks`
diff --git a/src/routes/_api/bookmark.js b/src/routes/_api/bookmark.js
index 3fde63d2..1e3a3ecc 100644
--- a/src/routes/_api/bookmark.js
+++ b/src/routes/_api/bookmark.js
@@ -1,5 +1,5 @@
-import { post, WRITE_TIMEOUT } from '../_utils/ajax'
-import { auth, basename } from './utils'
+import { post, WRITE_TIMEOUT } from '../_utils/ajax.js'
+import { auth, basename } from './utils.js'
 
 export async function bookmarkStatus (instanceName, accessToken, statusId) {
   const url = `${basename(instanceName)}/api/v1/statuses/${statusId}/bookmark`
diff --git a/src/routes/_api/delete.js b/src/routes/_api/delete.js
index d8a9a765..b497659b 100644
--- a/src/routes/_api/delete.js
+++ b/src/routes/_api/delete.js
@@ -1,5 +1,5 @@
-import { auth, basename } from './utils'
-import { del, WRITE_TIMEOUT } from '../_utils/ajax'
+import { auth, basename } from './utils.js'
+import { del, WRITE_TIMEOUT } from '../_utils/ajax.js'
 
 export async function deleteStatus (instanceName, accessToken, statusId) {
   const url = `${basename(instanceName)}/api/v1/statuses/${statusId}`
diff --git a/src/routes/_api/emoji.js b/src/routes/_api/emoji.js
index e0a30089..58bcd923 100644
--- a/src/routes/_api/emoji.js
+++ b/src/routes/_api/emoji.js
@@ -1,5 +1,5 @@
-import { auth, basename } from './utils'
-import { DEFAULT_TIMEOUT, get } from '../_utils/ajax'
+import { auth, basename } from './utils.js'
+import { DEFAULT_TIMEOUT, get } from '../_utils/ajax.js'
 
 export function getCustomEmoji (instanceName, accessToken) {
   const url = `${basename(instanceName)}/api/v1/custom_emojis`
diff --git a/src/routes/_api/favorite.js b/src/routes/_api/favorite.js
index 5232cac7..dbb38a65 100644
--- a/src/routes/_api/favorite.js
+++ b/src/routes/_api/favorite.js
@@ -1,5 +1,5 @@
-import { post, WRITE_TIMEOUT } from '../_utils/ajax'
-import { basename, auth } from './utils'
+import { post, WRITE_TIMEOUT } from '../_utils/ajax.js'
+import { basename, auth } from './utils.js'
 
 export async function favoriteStatus (instanceName, accessToken, statusId) {
   const url = `${basename(instanceName)}/api/v1/statuses/${statusId}/favourite`
diff --git a/src/routes/_api/filters.js b/src/routes/_api/filters.js
index 98ec6050..4849098a 100644
--- a/src/routes/_api/filters.js
+++ b/src/routes/_api/filters.js
@@ -1,5 +1,5 @@
-import { get, DEFAULT_TIMEOUT, post, WRITE_TIMEOUT, put, del } from '../_utils/ajax'
-import { auth, basename } from './utils'
+import { get, DEFAULT_TIMEOUT, post, WRITE_TIMEOUT, put, del } from '../_utils/ajax.js'
+import { auth, basename } from './utils.js'
 
 export function getFilters (instanceName, accessToken) {
   const url = `${basename(instanceName)}/api/v1/filters`
diff --git a/src/routes/_api/follow.js b/src/routes/_api/follow.js
index 3e16b0a7..5fdb75e1 100644
--- a/src/routes/_api/follow.js
+++ b/src/routes/_api/follow.js
@@ -1,5 +1,5 @@
-import { post, WRITE_TIMEOUT } from '../_utils/ajax'
-import { auth, basename } from './utils'
+import { post, WRITE_TIMEOUT } from '../_utils/ajax.js'
+import { auth, basename } from './utils.js'
 
 export async function followAccount (instanceName, accessToken, accountId) {
   const url = `${basename(instanceName)}/api/v1/accounts/${accountId}/follow`
diff --git a/src/routes/_api/followRequests.js b/src/routes/_api/followRequests.js
index 7f6c87c5..c6b23e23 100644
--- a/src/routes/_api/followRequests.js
+++ b/src/routes/_api/followRequests.js
@@ -1,5 +1,5 @@
-import { DEFAULT_TIMEOUT, get, post, WRITE_TIMEOUT } from '../_utils/ajax'
-import { auth, basename } from './utils'
+import { DEFAULT_TIMEOUT, get, post, WRITE_TIMEOUT } from '../_utils/ajax.js'
+import { auth, basename } from './utils.js'
 
 export async function getFollowRequests (instanceName, accessToken) {
   const url = `${basename(instanceName)}/api/v1/follow_requests`
diff --git a/src/routes/_api/followsAndFollowers.js b/src/routes/_api/followsAndFollowers.js
index 0f540bc2..f6d25d7b 100644
--- a/src/routes/_api/followsAndFollowers.js
+++ b/src/routes/_api/followsAndFollowers.js
@@ -1,5 +1,5 @@
-import { get, paramsString, DEFAULT_TIMEOUT } from '../_utils/ajax'
-import { auth, basename } from './utils'
+import { get, paramsString, DEFAULT_TIMEOUT } from '../_utils/ajax.js'
+import { auth, basename } from './utils.js'
 
 export async function getFollows (instanceName, accessToken, accountId, limit = 80) {
   let url = `${basename(instanceName)}/api/v1/accounts/${accountId}/following`
diff --git a/src/routes/_api/instance.js b/src/routes/_api/instance.js
index 1b7cb624..7538b8dd 100644
--- a/src/routes/_api/instance.js
+++ b/src/routes/_api/instance.js
@@ -1,5 +1,5 @@
-import { get, DEFAULT_TIMEOUT } from '../_utils/ajax'
-import { basename } from './utils'
+import { get, DEFAULT_TIMEOUT } from '../_utils/ajax.js'
+import { basename } from './utils.js'
 
 export function getInstanceInfo (instanceName) {
   const url = `${basename(instanceName)}/api/v1/instance`
diff --git a/src/routes/_api/lists.js b/src/routes/_api/lists.js
index 9c92b63e..14434c05 100644
--- a/src/routes/_api/lists.js
+++ b/src/routes/_api/lists.js
@@ -1,5 +1,5 @@
-import { get, DEFAULT_TIMEOUT, post, WRITE_TIMEOUT } from '../_utils/ajax'
-import { auth, basename } from './utils'
+import { get, DEFAULT_TIMEOUT, post, WRITE_TIMEOUT } from '../_utils/ajax.js'
+import { auth, basename } from './utils.js'
 
 export function getLists (instanceName, accessToken) {
   const url = `${basename(instanceName)}/api/v1/lists`
diff --git a/src/routes/_api/media.js b/src/routes/_api/media.js
index 68bd0d21..30f30a60 100644
--- a/src/routes/_api/media.js
+++ b/src/routes/_api/media.js
@@ -1,5 +1,5 @@
-import { auth, basename } from './utils'
-import { post, put, MEDIA_WRITE_TIMEOUT, WRITE_TIMEOUT } from '../_utils/ajax'
+import { auth, basename } from './utils.js'
+import { post, put, MEDIA_WRITE_TIMEOUT, WRITE_TIMEOUT } from '../_utils/ajax.js'
 
 export async function uploadMedia (instanceName, accessToken, file, description) {
   const formData = new FormData()
diff --git a/src/routes/_api/mute.js b/src/routes/_api/mute.js
index cecc7f69..04ce61cd 100644
--- a/src/routes/_api/mute.js
+++ b/src/routes/_api/mute.js
@@ -1,5 +1,5 @@
-import { auth, basename } from './utils'
-import { post, WRITE_TIMEOUT } from '../_utils/ajax'
+import { auth, basename } from './utils.js'
+import { post, WRITE_TIMEOUT } from '../_utils/ajax.js'
 
 export async function muteAccount (instanceName, accessToken, accountId, notifications) {
   const url = `${basename(instanceName)}/api/v1/accounts/${accountId}/mute`
diff --git a/src/routes/_api/muteConversation.js b/src/routes/_api/muteConversation.js
index c9c9a7da..e9672e08 100644
--- a/src/routes/_api/muteConversation.js
+++ b/src/routes/_api/muteConversation.js
@@ -1,5 +1,5 @@
-import { auth, basename } from './utils'
-import { post, WRITE_TIMEOUT } from '../_utils/ajax'
+import { auth, basename } from './utils.js'
+import { post, WRITE_TIMEOUT } from '../_utils/ajax.js'
 
 export async function muteConversation (instanceName, accessToken, statusId) {
   const url = `${basename(instanceName)}/api/v1/statuses/${statusId}/mute`
diff --git a/src/routes/_api/oauth.js b/src/routes/_api/oauth.js
index b804dc88..630082cc 100644
--- a/src/routes/_api/oauth.js
+++ b/src/routes/_api/oauth.js
@@ -1,5 +1,5 @@
-import { post, paramsString, WRITE_TIMEOUT } from '../_utils/ajax'
-import { basename } from './utils'
+import { post, paramsString, WRITE_TIMEOUT } from '../_utils/ajax.js'
+import { basename } from './utils.js'
 
 const WEBSITE = 'https://pinafore.social'
 const SCOPES = 'read write follow push'
diff --git a/src/routes/_api/pin.js b/src/routes/_api/pin.js
index 61960eeb..3b18205b 100644
--- a/src/routes/_api/pin.js
+++ b/src/routes/_api/pin.js
@@ -1,5 +1,5 @@
-import { post, WRITE_TIMEOUT } from '../_utils/ajax'
-import { auth, basename } from './utils'
+import { post, WRITE_TIMEOUT } from '../_utils/ajax.js'
+import { auth, basename } from './utils.js'
 
 export async function pinStatus (instanceName, accessToken, statusId) {
   const url = `${basename(instanceName)}/api/v1/statuses/${statusId}/pin`
diff --git a/src/routes/_api/pinnedStatuses.js b/src/routes/_api/pinnedStatuses.js
index d17aa35d..bf6fadbe 100644
--- a/src/routes/_api/pinnedStatuses.js
+++ b/src/routes/_api/pinnedStatuses.js
@@ -1,5 +1,5 @@
-import { get, paramsString, DEFAULT_TIMEOUT } from '../_utils/ajax'
-import { auth, basename } from './utils'
+import { get, paramsString, DEFAULT_TIMEOUT } from '../_utils/ajax.js'
+import { auth, basename } from './utils.js'
 
 export async function getPinnedStatuses (instanceName, accessToken, accountId) {
   let url = `${basename(instanceName)}/api/v1/accounts/${accountId}/statuses`
diff --git a/src/routes/_api/polls.js b/src/routes/_api/polls.js
index b4163779..5d4be01a 100644
--- a/src/routes/_api/polls.js
+++ b/src/routes/_api/polls.js
@@ -1,5 +1,5 @@
-import { get, post, DEFAULT_TIMEOUT, WRITE_TIMEOUT } from '../_utils/ajax'
-import { auth, basename } from './utils'
+import { get, post, DEFAULT_TIMEOUT, WRITE_TIMEOUT } from '../_utils/ajax.js'
+import { auth, basename } from './utils.js'
 
 export async function getPoll (instanceName, accessToken, pollId) {
   const url = `${basename(instanceName)}/api/v1/polls/${pollId}`
diff --git a/src/routes/_api/pushSubscription.js b/src/routes/_api/pushSubscription.js
index a17a1455..43ffc1e3 100644
--- a/src/routes/_api/pushSubscription.js
+++ b/src/routes/_api/pushSubscription.js
@@ -1,5 +1,5 @@
-import { auth, basename } from './utils'
-import { post, put, get, del } from '../_utils/ajax'
+import { auth, basename } from './utils.js'
+import { post, put, get, del } from '../_utils/ajax.js'
 
 export async function postSubscription (instanceName, accessToken, subscription, alerts) {
   const url = `${basename(instanceName)}/api/v1/push/subscription`
diff --git a/src/routes/_api/reblog.js b/src/routes/_api/reblog.js
index ccfc650a..5ba4ab7d 100644
--- a/src/routes/_api/reblog.js
+++ b/src/routes/_api/reblog.js
@@ -1,5 +1,5 @@
-import { post } from '../_utils/ajax'
-import { basename, auth } from './utils'
+import { post } from '../_utils/ajax.js'
+import { basename, auth } from './utils.js'
 
 export async function reblogStatus (instanceName, accessToken, statusId) {
   const url = `${basename(instanceName)}/api/v1/statuses/${statusId}/reblog`
diff --git a/src/routes/_api/reblogsAndFavs.js b/src/routes/_api/reblogsAndFavs.js
index 6185fc48..f2b358b4 100644
--- a/src/routes/_api/reblogsAndFavs.js
+++ b/src/routes/_api/reblogsAndFavs.js
@@ -1,5 +1,5 @@
-import { get, paramsString, DEFAULT_TIMEOUT } from '../_utils/ajax'
-import { auth, basename } from './utils'
+import { get, paramsString, DEFAULT_TIMEOUT } from '../_utils/ajax.js'
+import { auth, basename } from './utils.js'
 
 export async function getReblogs (instanceName, accessToken, statusId, limit = 80) {
   let url = `${basename(instanceName)}/api/v1/statuses/${statusId}/reblogged_by`
diff --git a/src/routes/_api/relationships.js b/src/routes/_api/relationships.js
index e1a6acd9..6aa701d6 100644
--- a/src/routes/_api/relationships.js
+++ b/src/routes/_api/relationships.js
@@ -1,5 +1,5 @@
-import { basename, auth } from './utils'
-import { get, paramsString, DEFAULT_TIMEOUT } from '../_utils/ajax'
+import { basename, auth } from './utils.js'
+import { get, paramsString, DEFAULT_TIMEOUT } from '../_utils/ajax.js'
 
 export async function getRelationship (instanceName, accessToken, accountId) {
   const url = `${basename(instanceName)}/api/v1/accounts/relationships?${paramsString({ id: accountId })}`
diff --git a/src/routes/_api/report.js b/src/routes/_api/report.js
index f002f96d..b7a876a4 100644
--- a/src/routes/_api/report.js
+++ b/src/routes/_api/report.js
@@ -1,5 +1,5 @@
-import { auth, basename } from './utils'
-import { post } from '../_utils/ajax'
+import { auth, basename } from './utils.js'
+import { post } from '../_utils/ajax.js'
 
 export async function report (instanceName, accessToken, accountId, statusIds, comment, forward) {
   const url = `${basename(instanceName)}/api/v1/reports`
diff --git a/src/routes/_api/requests.js b/src/routes/_api/requests.js
index fc8c0668..746d30c7 100644
--- a/src/routes/_api/requests.js
+++ b/src/routes/_api/requests.js
@@ -1,5 +1,5 @@
-import { post, WRITE_TIMEOUT } from '../_utils/ajax'
-import { auth, basename } from './utils'
+import { post, WRITE_TIMEOUT } from '../_utils/ajax.js'
+import { auth, basename } from './utils.js'
 
 export async function approveFollowRequest (instanceName, accessToken, accountId) {
   const url = `${basename(instanceName)}/api/v1/follow_requests/${accountId}/authorize`
diff --git a/src/routes/_api/search.js b/src/routes/_api/search.js
index 4e8e96cc..f2050311 100644
--- a/src/routes/_api/search.js
+++ b/src/routes/_api/search.js
@@ -1,5 +1,5 @@
-import { get, paramsString, DEFAULT_TIMEOUT } from '../_utils/ajax'
-import { auth, basename } from './utils'
+import { get, paramsString, DEFAULT_TIMEOUT } from '../_utils/ajax.js'
+import { auth, basename } from './utils.js'
 
 function doSearch (version, instanceName, accessToken, query, resolve, limit, excludeUnreviewed, signal) {
   const url = `${basename(instanceName)}/api/${version}/search?` + paramsString({
diff --git a/src/routes/_api/showReblogs.js b/src/routes/_api/showReblogs.js
index 45bf9bcc..b655d970 100644
--- a/src/routes/_api/showReblogs.js
+++ b/src/routes/_api/showReblogs.js
@@ -1,5 +1,5 @@
-import { auth, basename } from './utils'
-import { post, WRITE_TIMEOUT } from '../_utils/ajax'
+import { auth, basename } from './utils.js'
+import { post, WRITE_TIMEOUT } from '../_utils/ajax.js'
 
 export function setShowReblogs (instanceName, accessToken, accountId, showReblogs) {
   const url = `${basename(instanceName)}/api/v1/accounts/${accountId}/follow`
diff --git a/src/routes/_api/statuses.js b/src/routes/_api/statuses.js
index 5edf0a72..4ce8c115 100644
--- a/src/routes/_api/statuses.js
+++ b/src/routes/_api/statuses.js
@@ -1,5 +1,5 @@
-import { auth, basename } from './utils'
-import { DEFAULT_TIMEOUT, get, post, WRITE_TIMEOUT } from '../_utils/ajax'
+import { auth, basename } from './utils.js'
+import { DEFAULT_TIMEOUT, get, post, WRITE_TIMEOUT } from '../_utils/ajax.js'
 
 export async function postStatus (instanceName, accessToken, text, inReplyToId, mediaIds,
   sensitive, spoilerText, visibility, poll) {
diff --git a/src/routes/_api/stream/TimelineStream.js b/src/routes/_api/stream/TimelineStream.js
index 80d1f74d..1b539d23 100644
--- a/src/routes/_api/stream/TimelineStream.js
+++ b/src/routes/_api/stream/TimelineStream.js
@@ -1,9 +1,9 @@
-import { WebSocketClient } from '../../_thirdparty/websocket/websocket'
-import { lifecycle } from '../../_utils/lifecycle'
-import { getStreamUrl } from './getStreamUrl'
+import { WebSocketClient } from '../../_thirdparty/websocket/websocket.js'
+import { lifecycle } from '../../_utils/lifecycle.js'
+import { getStreamUrl } from './getStreamUrl.js'
 import { EventEmitter } from 'events-light'
-import { eventBus } from '../../_utils/eventBus'
-import { safeParse } from '../../_utils/safeParse'
+import { eventBus } from '../../_utils/eventBus.js'
+import { safeParse } from '../../_utils/safeParse.js'
 
 export class TimelineStream extends EventEmitter {
   constructor (streamingApi, accessToken, timeline) {
diff --git a/src/routes/_api/stream/getStreamUrl.js b/src/routes/_api/stream/getStreamUrl.js
index fa9268c4..20b9acba 100644
--- a/src/routes/_api/stream/getStreamUrl.js
+++ b/src/routes/_api/stream/getStreamUrl.js
@@ -1,4 +1,4 @@
-import { paramsString } from '../../_utils/ajax'
+import { paramsString } from '../../_utils/ajax.js'
 
 function getStreamName (timeline) {
   switch (timeline) {
diff --git a/src/routes/_api/timelines.js b/src/routes/_api/timelines.js
index fe436dfa..bbc98876 100644
--- a/src/routes/_api/timelines.js
+++ b/src/routes/_api/timelines.js
@@ -1,5 +1,5 @@
-import { getWithHeaders, paramsString, DEFAULT_TIMEOUT } from '../_utils/ajax'
-import { auth, basename } from './utils'
+import { getWithHeaders, paramsString, DEFAULT_TIMEOUT } from '../_utils/ajax.js'
+import { auth, basename } from './utils.js'
 
 function getTimelineUrlPath (timeline) {
   switch (timeline) {
diff --git a/src/routes/_api/updateCredentials.js b/src/routes/_api/updateCredentials.js
index 4226a70d..604550d5 100644
--- a/src/routes/_api/updateCredentials.js
+++ b/src/routes/_api/updateCredentials.js
@@ -1,5 +1,5 @@
-import { WRITE_TIMEOUT, patch } from '../_utils/ajax'
-import { auth, basename } from './utils'
+import { WRITE_TIMEOUT, patch } from '../_utils/ajax.js'
+import { auth, basename } from './utils.js'
 
 export async function updateCredentials (instanceName, accessToken, accountData) {
   const url = `${basename(instanceName)}/api/v1/accounts/update_credentials`
diff --git a/src/routes/_api/user.js b/src/routes/_api/user.js
index 0ad2778a..4d479935 100644
--- a/src/routes/_api/user.js
+++ b/src/routes/_api/user.js
@@ -1,5 +1,5 @@
-import { get, DEFAULT_TIMEOUT } from '../_utils/ajax'
-import { auth, basename } from './utils'
+import { get, DEFAULT_TIMEOUT } from '../_utils/ajax.js'
+import { auth, basename } from './utils.js'
 
 export function getVerifyCredentials (instanceName, accessToken) {
   const url = `${basename(instanceName)}/api/v1/accounts/verify_credentials`
diff --git a/src/routes/_components/AccountsListPage.html b/src/routes/_components/AccountsListPage.html
index 9179befe..cc3fba14 100644
--- a/src/routes/_components/AccountsListPage.html
+++ b/src/routes/_components/AccountsListPage.html
@@ -31,12 +31,12 @@
   }
 </style>
 <script>
-  import { store } from '../_store/store'
+  import { store } from '../_store/store.js'
   import LoadingPage from './LoadingPage.html'
   import AccountSearchResult from './search/AccountSearchResult.html'
-  import { toast } from './toast/toast'
-  import { on } from '../_utils/eventBus'
-  import { formatIntl } from '../_utils/formatIntl'
+  import { toast } from './toast/toast.js'
+  import { on } from '../_utils/eventBus.js'
+  import { formatIntl } from '../_utils/formatIntl.js'
 
   // TODO: paginate
   export default {
diff --git a/src/routes/_components/AutoplayVideo.html b/src/routes/_components/AutoplayVideo.html
index d119c684..208f9f02 100644
--- a/src/routes/_components/AutoplayVideo.html
+++ b/src/routes/_components/AutoplayVideo.html
@@ -38,8 +38,8 @@
   }
 </style>
 <script>
-  import { store } from '../_store/store'
-  import { coordsToPercent } from '../_utils/coordsToPercent'
+  import { store } from '../_store/store.js'
+  import { coordsToPercent } from '../_utils/coordsToPercent.js'
 
   export default {
 
diff --git a/src/routes/_components/Avatar.html b/src/routes/_components/Avatar.html
index efd9421f..ec3c7361 100644
--- a/src/routes/_components/Avatar.html
+++ b/src/routes/_components/Avatar.html
@@ -40,9 +40,9 @@
   }
 </style>
 <script>
-  import { store } from '../_store/store'
+  import { store } from '../_store/store.js'
   import NonAutoplayImg from './NonAutoplayImg.html'
-  import { classname } from '../_utils/classname'
+  import { classname } from '../_utils/classname.js'
   import LazyImage from './LazyImage.html'
   import SvgIcon from './SvgIcon.html'
 
diff --git a/src/routes/_components/Draggable.html b/src/routes/_components/Draggable.html
index 4b5c3f37..66cbe152 100644
--- a/src/routes/_components/Draggable.html
+++ b/src/routes/_components/Draggable.html
@@ -35,10 +35,10 @@
 </style>
 <script>
   import { observe } from 'svelte-extras'
-  import { throttleTimer } from '../_utils/throttleTimer'
-  import { pointerUp, pointerDown, pointerLeave, pointerMove } from '../_utils/pointerEvents'
-  import { requestPostAnimationFrame } from '../_utils/requestPostAnimationFrame'
-  import { classname } from '../_utils/classname'
+  import { throttleTimer } from '../_utils/throttleTimer.js'
+  import { pointerUp, pointerDown, pointerLeave, pointerMove } from '../_utils/pointerEvents.js'
+  import { requestPostAnimationFrame } from '../_utils/requestPostAnimationFrame.js'
+  import { classname } from '../_utils/classname.js'
 
   // ensure DOM writes only happen once after a rAF
   const updateIndicatorStyle = throttleTimer(requestAnimationFrame)
diff --git a/src/routes/_components/ExternalLink.html b/src/routes/_components/ExternalLink.html
index e126d9ad..0a3252ae 100644
--- a/src/routes/_components/ExternalLink.html
+++ b/src/routes/_components/ExternalLink.html
@@ -22,7 +22,7 @@
   }
 </style>
 <script>
-  import { classname } from '../_utils/classname'
+  import { classname } from '../_utils/classname.js'
   import SvgIcon from './SvgIcon.html'
 
   export default {
diff --git a/src/routes/_components/FocusRestoration.html b/src/routes/_components/FocusRestoration.html
index b775e8fd..30369107 100644
--- a/src/routes/_components/FocusRestoration.html
+++ b/src/routes/_components/FocusRestoration.html
@@ -5,9 +5,9 @@
   <slot></slot>
 </div>
 <script>
-  import { PAGE_HISTORY_SIZE } from '../_static/pages'
-  import { QuickLRU } from '../_thirdparty/quick-lru/quick-lru'
-  import { tryToFocusElement } from '../_utils/tryToFocusElement'
+  import { PAGE_HISTORY_SIZE } from '../_static/pages.js'
+  import { QuickLRU } from '../_thirdparty/quick-lru/quick-lru.js'
+  import { tryToFocusElement } from '../_utils/tryToFocusElement.js'
 
   const cache = new QuickLRU({ maxSize: PAGE_HISTORY_SIZE })
 
diff --git a/src/routes/_components/IconButton.html b/src/routes/_components/IconButton.html
index f7a90110..52de5c40 100644
--- a/src/routes/_components/IconButton.html
+++ b/src/routes/_components/IconButton.html
@@ -92,8 +92,8 @@
 
 </style>
 <script>
-  import { classname } from '../_utils/classname'
-  import { store } from '../_store/store'
+  import { classname } from '../_utils/classname.js'
+  import { store } from '../_store/store.js'
   import SvgIcon from './SvgIcon.html'
 
   export default {
diff --git a/src/routes/_components/LazyImage.html b/src/routes/_components/LazyImage.html
index 252068fd..49c690e6 100644
--- a/src/routes/_components/LazyImage.html
+++ b/src/routes/_components/LazyImage.html
@@ -32,8 +32,8 @@
 
 </style>
 <script>
-  import { decodeImage } from '../_utils/decodeImage'
-  import { coordsToPercent } from '../_utils/coordsToPercent'
+  import { decodeImage } from '../_utils/decodeImage.js'
+  import { coordsToPercent } from '../_utils/coordsToPercent.js'
 
   export default {
     async oncreate () {
diff --git a/src/routes/_components/LazyPage.html b/src/routes/_components/LazyPage.html
index e1cd95db..52bb6dab 100644
--- a/src/routes/_components/LazyPage.html
+++ b/src/routes/_components/LazyPage.html
@@ -2,7 +2,7 @@
   <svelte:component this={pageComponent} {params} />
 {/if}
 <script>
-  import { doubleRAF } from '../_utils/doubleRAF'
+  import { doubleRAF } from '../_utils/doubleRAF.js'
   // On the very first page load, avoid doing a "reveal" because
   // it leads to a flash between when the SSR is shown, the two frame we hide it,
   // and then when we show it again.
diff --git a/src/routes/_components/LengthGauge.html b/src/routes/_components/LengthGauge.html
index 0db36d9e..ee60b670 100644
--- a/src/routes/_components/LengthGauge.html
+++ b/src/routes/_components/LengthGauge.html
@@ -16,11 +16,11 @@
   }
 </style>
 <script>
-  import { mark, stop } from '../_utils/marks'
-  import { store } from '../_store/store'
+  import { mark, stop } from '../_utils/marks.js'
+  import { store } from '../_store/store.js'
   import { observe } from 'svelte-extras'
-  import { throttleTimer } from '../_utils/throttleTimer'
-  import { classname } from '../_utils/classname'
+  import { throttleTimer } from '../_utils/throttleTimer.js'
+  import { classname } from '../_utils/classname.js'
 
   const updateDisplayedLength = process.browser && throttleTimer(requestAnimationFrame)
 
diff --git a/src/routes/_components/LengthIndicator.html b/src/routes/_components/LengthIndicator.html
index e6a389b2..b231c7ab 100644
--- a/src/routes/_components/LengthIndicator.html
+++ b/src/routes/_components/LengthIndicator.html
@@ -13,11 +13,11 @@
   }
 </style>
 <script>
-  import { mark, stop } from '../_utils/marks'
-  import { store } from '../_store/store'
+  import { mark, stop } from '../_utils/marks.js'
+  import { store } from '../_store/store.js'
   import { observe } from 'svelte-extras'
-  import { throttleTimer } from '../_utils/throttleTimer'
-  import { formatIntl } from '../_utils/formatIntl'
+  import { throttleTimer } from '../_utils/throttleTimer.js'
+  import { formatIntl } from '../_utils/formatIntl.js'
 
   const updateDisplayedLength = process.browser && throttleTimer(requestAnimationFrame)
 
diff --git a/src/routes/_components/LoadingMask.html b/src/routes/_components/LoadingMask.html
index decfda93..ef706855 100644
--- a/src/routes/_components/LoadingMask.html
+++ b/src/routes/_components/LoadingMask.html
@@ -32,7 +32,7 @@
 </style>
 <script>
   import LoadingSpinner from './LoadingSpinner.html'
-  import { store } from '../_store/store'
+  import { store } from '../_store/store.js'
 
   export default {
     store: () => store,
diff --git a/src/routes/_components/MediaControlsFix.html b/src/routes/_components/MediaControlsFix.html
index 5c9b2d77..9f94b441 100644
--- a/src/routes/_components/MediaControlsFix.html
+++ b/src/routes/_components/MediaControlsFix.html
@@ -23,8 +23,8 @@
   }
 </style>
 <script>
-  import { FOCUSABLE_ELEMENTS_QUERY } from '../_thirdparty/a11y-dialog/a11y-dialog'
-  import { documentKeydown } from '../_utils/events'
+  import { FOCUSABLE_ELEMENTS_QUERY } from '../_thirdparty/a11y-dialog/a11y-dialog.js'
+  import { documentKeydown } from '../_utils/events.js'
 
   export default {
     data: () => ({
diff --git a/src/routes/_components/Nav.html b/src/routes/_components/Nav.html
index e91d14fb..56f597fe 100644
--- a/src/routes/_components/Nav.html
+++ b/src/routes/_components/Nav.html
@@ -50,9 +50,9 @@
 
 </style>
 <script>
-  import NavItem from './NavItem'
+  import NavItem from './NavItem.html'
   import { importNavShortcuts } from '../_utils/asyncModules/importNavShortcuts.js'
-  import { store } from '../_store/store'
+  import { store } from '../_store/store.js'
 
   export default {
     async oncreate () {
diff --git a/src/routes/_components/NavItem.html b/src/routes/_components/NavItem.html
index ff569d18..d14d89f5 100644
--- a/src/routes/_components/NavItem.html
+++ b/src/routes/_components/NavItem.html
@@ -122,13 +122,13 @@
 </style>
 <script>
   import NavItemIcon from './NavItemIcon.html'
-  import { store } from '../_store/store'
-  import { on, emit } from '../_utils/eventBus'
-  import { mark, stop } from '../_utils/marks'
-  import { doubleRAF } from '../_utils/doubleRAF'
-  import { scrollToTop } from '../_utils/scrollToTop'
-  import { normalizePageName } from '../_utils/normalizePageName'
-  import { formatIntl } from '../_utils/formatIntl'
+  import { store } from '../_store/store.js'
+  import { on, emit } from '../_utils/eventBus.js'
+  import { mark, stop } from '../_utils/marks.js'
+  import { doubleRAF } from '../_utils/doubleRAF.js'
+  import { scrollToTop } from '../_utils/scrollToTop.js'
+  import { normalizePageName } from '../_utils/normalizePageName.js'
+  import { formatIntl } from '../_utils/formatIntl.js'
 
   export default {
     oncreate () {
diff --git a/src/routes/_components/NavShortcuts.html b/src/routes/_components/NavShortcuts.html
index b2192f72..7df07b9c 100644
--- a/src/routes/_components/NavShortcuts.html
+++ b/src/routes/_components/NavShortcuts.html
@@ -17,13 +17,13 @@
 {/each}
 
 <script>
-  import Shortcut from './shortcut/Shortcut'
-  import { goto } from '../../../__sapper__/client'
-  import { importShowShortcutHelpDialog } from './dialog/asyncDialogs/importShowShortcutHelpDialog'
-  import { importShowComposeDialog } from './dialog/asyncDialogs/importShowComposeDialog'
-  import { store } from '../_store/store'
-  import { normalizePageName } from '../_utils/normalizePageName'
-  import { goToSearch } from '../_actions/goToSearch'
+  import Shortcut from './shortcut/Shortcut.html'
+  import { goto } from '../../../__sapper__/client.js'
+  import { importShowShortcutHelpDialog } from './dialog/asyncDialogs/importShowShortcutHelpDialog.js'
+  import { importShowComposeDialog } from './dialog/asyncDialogs/importShowComposeDialog.js'
+  import { store } from '../_store/store.js'
+  import { normalizePageName } from '../_utils/normalizePageName.js'
+  import { goToSearch } from '../_actions/goToSearch.js'
 
   export default {
     store: () => store,
diff --git a/src/routes/_components/NonAutoplayGifv.html b/src/routes/_components/NonAutoplayGifv.html
index f93e530c..7fd08c67 100644
--- a/src/routes/_components/NonAutoplayGifv.html
+++ b/src/routes/_components/NonAutoplayGifv.html
@@ -51,9 +51,9 @@
   }
 </style>
 <script>
-  import { mouseover } from '../_utils/events'
+  import { mouseover } from '../_utils/events.js'
   import PlayVideoIcon from './PlayVideoIcon.html'
-  import { ONE_TRANSPARENT_PIXEL } from '../_static/media'
+  import { ONE_TRANSPARENT_PIXEL } from '../_static/media.js'
   import LazyImage from './LazyImage.html'
   import AutoplayVideo from './AutoplayVideo.html'
 
diff --git a/src/routes/_components/NonAutoplayImg.html b/src/routes/_components/NonAutoplayImg.html
index 367b3e61..18e29ce8 100644
--- a/src/routes/_components/NonAutoplayImg.html
+++ b/src/routes/_components/NonAutoplayImg.html
@@ -18,10 +18,10 @@
   }
 </style>
 <script>
-  import { mouseover } from '../_utils/events'
-  import { decodeImage } from '../_utils/decodeImage'
-  import { classname } from '../_utils/classname'
-  import { ONE_TRANSPARENT_PIXEL } from '../_static/media'
+  import { mouseover } from '../_utils/events.js'
+  import { decodeImage } from '../_utils/decodeImage.js'
+  import { classname } from '../_utils/classname.js'
+  import { ONE_TRANSPARENT_PIXEL } from '../_static/media.js'
 
   export default {
     async oncreate () {
diff --git a/src/routes/_components/ShortcutHelpInfo.html b/src/routes/_components/ShortcutHelpInfo.html
index 3e12dc7a..d6b72ded 100644
--- a/src/routes/_components/ShortcutHelpInfo.html
+++ b/src/routes/_components/ShortcutHelpInfo.html
@@ -60,8 +60,8 @@
   }
 </style>
 <script>
-  import { store } from '../_store/store'
-  import { formatIntl } from '../_utils/formatIntl'
+  import { store } from '../_store/store.js'
+  import { formatIntl } from '../_utils/formatIntl.js'
 
   export default {
     store: () => store,
diff --git a/src/routes/_components/SvgIcon.html b/src/routes/_components/SvgIcon.html
index 0fed1a44..c89262f9 100644
--- a/src/routes/_components/SvgIcon.html
+++ b/src/routes/_components/SvgIcon.html
@@ -7,8 +7,8 @@
   <use xlink:href="{inline ? '' : '/icons.svg'}{href}" />
 </svg>
 <script>
-  import { animate } from '../_utils/animate'
-  import { store } from '../_store/store'
+  import { animate } from '../_utils/animate.js'
+  import { store } from '../_store/store.js'
 
   const inlineSvgs = new Set(process.env.INLINE_SVGS)
 
diff --git a/src/routes/_components/TabSet.html b/src/routes/_components/TabSet.html
index d266f190..a9db0dac 100644
--- a/src/routes/_components/TabSet.html
+++ b/src/routes/_components/TabSet.html
@@ -84,7 +84,7 @@
   }
 </style>
 <script>
-  import { formatIntl } from '../_utils/formatIntl'
+  import { formatIntl } from '../_utils/formatIntl.js'
 
   export default {
     data: () => ({
diff --git a/src/routes/_components/Title.html b/src/routes/_components/Title.html
index 1c9db72b..3707eb98 100644
--- a/src/routes/_components/Title.html
+++ b/src/routes/_components/Title.html
@@ -2,8 +2,8 @@
   <title>{title}</title>
 </svelte:head>
 <script>
-  import { store } from '../_store/store'
-  import { formatIntl } from '../_utils/formatIntl'
+  import { store } from '../_store/store.js'
+  import { formatIntl } from '../_utils/formatIntl.js'
 
   export default {
     data: () => ({
diff --git a/src/routes/_components/community/PageListItem.html b/src/routes/_components/community/PageListItem.html
index 34f93839..3c4ad63f 100644
--- a/src/routes/_components/community/PageListItem.html
+++ b/src/routes/_components/community/PageListItem.html
@@ -116,10 +116,10 @@
 
 </style>
 <script>
-  import { store } from '../../_store/store'
+  import { store } from '../../_store/store.js'
   import SvgIcon from '../SvgIcon.html'
   import RadioGroupButton from '../../_components/radio/RadioGroupButton.html'
-  import { formatIntl } from '../../_utils/formatIntl'
+  import { formatIntl } from '../../_utils/formatIntl.js'
 
   export default {
     store: () => store,
diff --git a/src/routes/_components/compose/ComposeAuthor.html b/src/routes/_components/compose/ComposeAuthor.html
index ed6d0fde..ad9508e8 100644
--- a/src/routes/_components/compose/ComposeAuthor.html
+++ b/src/routes/_components/compose/ComposeAuthor.html
@@ -75,11 +75,11 @@
 </style>
 <script>
   import Avatar from '../Avatar.html'
-  import { store } from '../../_store/store'
+  import { store } from '../../_store/store.js'
   import AccountDisplayName from '../profile/AccountDisplayName.html'
-  import { ONE_TRANSPARENT_PIXEL } from '../../_static/media'
-  import { emit } from '../../_utils/eventBus'
-  import { goto } from '../../../../__sapper__/client'
+  import { ONE_TRANSPARENT_PIXEL } from '../../_static/media.js'
+  import { emit } from '../../_utils/eventBus.js'
+  import { goto } from '../../../../__sapper__/client.js'
 
   export default {
     components: {
diff --git a/src/routes/_components/compose/ComposeAutosuggest.html b/src/routes/_components/compose/ComposeAutosuggest.html
index 45254f1f..a231b84a 100644
--- a/src/routes/_components/compose/ComposeAutosuggest.html
+++ b/src/routes/_components/compose/ComposeAutosuggest.html
@@ -8,14 +8,14 @@
 </style>
 <script>
   import ComposeAutosuggestContainer from './ComposeAutosuggestContainer.html'
-  import { requestPostAnimationFrame } from '../../_utils/requestPostAnimationFrame'
+  import { requestPostAnimationFrame } from '../../_utils/requestPostAnimationFrame.js'
   import { observe } from 'svelte-extras'
-  import { throttleTimer } from '../../_utils/throttleTimer'
-  import { on } from '../../_utils/eventBus'
-  import { store } from '../../_store/store'
-  import { addScrollListener, getScrollContainer, removeScrollListener } from '../../_utils/scrollContainer'
-  import { get } from '../../_utils/lodash-lite'
-  import { registerResizeListener, unregisterResizeListener } from '../../_utils/resize'
+  import { throttleTimer } from '../../_utils/throttleTimer.js'
+  import { on } from '../../_utils/eventBus.js'
+  import { store } from '../../_store/store.js'
+  import { addScrollListener, getScrollContainer, removeScrollListener } from '../../_utils/scrollContainer.js'
+  import { get } from '../../_utils/lodash-lite.js'
+  import { registerResizeListener, unregisterResizeListener } from '../../_utils/resize.js'
 
   const updatePosition = process.browser && throttleTimer(requestAnimationFrame)
 
diff --git a/src/routes/_components/compose/ComposeAutosuggestContainer.html b/src/routes/_components/compose/ComposeAutosuggestContainer.html
index e0fba976..df267579 100644
--- a/src/routes/_components/compose/ComposeAutosuggestContainer.html
+++ b/src/routes/_components/compose/ComposeAutosuggestContainer.html
@@ -52,12 +52,12 @@
 
 </style>
 <script>
-  import { store } from '../../_store/store'
+  import { store } from '../../_store/store.js'
   import ComposeAutosuggestionList from './ComposeAutosuggestionList.html'
-  import { get } from '../../_utils/lodash-lite'
-  import { selectAutosuggestItem } from '../../_actions/autosuggest'
+  import { get } from '../../_utils/lodash-lite.js'
+  import { selectAutosuggestItem } from '../../_actions/autosuggest.js'
   import { observe } from 'svelte-extras'
-  import { once } from '../../_utils/once'
+  import { once } from '../../_utils/once.js'
 
   export default {
     oncreate () {
diff --git a/src/routes/_components/compose/ComposeAutosuggestionList.html b/src/routes/_components/compose/ComposeAutosuggestionList.html
index 352501cb..71f72a83 100644
--- a/src/routes/_components/compose/ComposeAutosuggestionList.html
+++ b/src/routes/_components/compose/ComposeAutosuggestionList.html
@@ -152,9 +152,9 @@
 </style>
 <script>
   import Avatar from '../Avatar.html'
-  import { store } from '../../_store/store'
+  import { store } from '../../_store/store.js'
   import AccountDisplayName from '../profile/AccountDisplayName.html'
-  import { createAutosuggestAccessibleLabel } from '../../_utils/createAutosuggestAccessibleLabel'
+  import { createAutosuggestAccessibleLabel } from '../../_utils/createAutosuggestAccessibleLabel.js'
   import SvgIcon from '../SvgIcon.html'
 
   export default {
diff --git a/src/routes/_components/compose/ComposeBox.html b/src/routes/_components/compose/ComposeBox.html
index a27c8c05..305ca4e7 100644
--- a/src/routes/_components/compose/ComposeBox.html
+++ b/src/routes/_components/compose/ComposeBox.html
@@ -104,14 +104,14 @@
   import ComposeAutosuggest from './ComposeAutosuggest.html'
   import ComposePoll from './ComposePoll.html'
   import ComposeMediaSensitive from './ComposeMediaSensitive.html'
-  import { measureText } from '../../_utils/measureText'
-  import { POST_PRIVACY_OPTIONS } from '../../_static/statuses'
-  import { store } from '../../_store/store'
-  import { slide } from '../../_transitions/slide'
-  import { postStatus, insertHandleForReply, setReplySpoiler, setReplyVisibility } from '../../_actions/compose'
-  import { classname } from '../../_utils/classname'
-  import { POLL_EXPIRY_DEFAULT } from '../../_static/polls'
-  import { scheduleIdleTask } from '../../_utils/scheduleIdleTask'
+  import { measureText } from '../../_utils/measureText.js'
+  import { POST_PRIVACY_OPTIONS } from '../../_static/statuses.js'
+  import { store } from '../../_store/store.js'
+  import { slide } from '../../_transitions/slide.js'
+  import { postStatus, insertHandleForReply, setReplySpoiler, setReplyVisibility } from '../../_actions/compose.js'
+  import { classname } from '../../_utils/classname.js'
+  import { POLL_EXPIRY_DEFAULT } from '../../_static/polls.js'
+  import { scheduleIdleTask } from '../../_utils/scheduleIdleTask.js'
 
   export default {
     oncreate () {
diff --git a/src/routes/_components/compose/ComposeButton.html b/src/routes/_components/compose/ComposeButton.html
index 8478b0e3..12ab968f 100644
--- a/src/routes/_components/compose/ComposeButton.html
+++ b/src/routes/_components/compose/ComposeButton.html
@@ -64,7 +64,7 @@
 </style>
 <script>
   import SvgIcon from '../SvgIcon.html'
-  import { store } from '../../_store/store'
+  import { store } from '../../_store/store.js'
 
   export default {
     store: () => store,
diff --git a/src/routes/_components/compose/ComposeContentWarning.html b/src/routes/_components/compose/ComposeContentWarning.html
index ca140009..a7a35658 100644
--- a/src/routes/_components/compose/ComposeContentWarning.html
+++ b/src/routes/_components/compose/ComposeContentWarning.html
@@ -14,10 +14,10 @@
   }
 </style>
 <script>
-  import { store } from '../../_store/store'
-  import { scheduleIdleTask } from '../../_utils/scheduleIdleTask'
+  import { store } from '../../_store/store.js'
+  import { scheduleIdleTask } from '../../_utils/scheduleIdleTask.js'
   import { observe } from 'svelte-extras'
-  import { throttleTimer } from '../../_utils/throttleTimer'
+  import { throttleTimer } from '../../_utils/throttleTimer.js'
 
   const updateContentWarningInStore = throttleTimer(scheduleIdleTask)
 
diff --git a/src/routes/_components/compose/ComposeFileDrop.html b/src/routes/_components/compose/ComposeFileDrop.html
index 1276ea61..b2a35006 100644
--- a/src/routes/_components/compose/ComposeFileDrop.html
+++ b/src/routes/_components/compose/ComposeFileDrop.html
@@ -58,8 +58,8 @@
   }
 </style>
 <script>
-  import { mediaAccept } from '../../_static/media'
-  import { doMediaUpload } from '../../_actions/media'
+  import { mediaAccept } from '../../_static/media.js'
+  import { doMediaUpload } from '../../_actions/media.js'
   if (process.browser) {
     require('file-drop-element')
   }
diff --git a/src/routes/_components/compose/ComposeInput.html b/src/routes/_components/compose/ComposeInput.html
index 51a3409c..544717cb 100644
--- a/src/routes/_components/compose/ComposeInput.html
+++ b/src/routes/_components/compose/ComposeInput.html
@@ -56,21 +56,21 @@
   }
 </style>
 <script>
-  import { store } from '../../_store/store'
-  import { autosize } from '../../_thirdparty/autosize/autosize'
-  import { scheduleIdleTask } from '../../_utils/scheduleIdleTask'
-  import { mark, stop } from '../../_utils/marks'
-  import { selectionChange } from '../../_utils/events'
+  import { store } from '../../_store/store.js'
+  import { autosize } from '../../_thirdparty/autosize/autosize.js'
+  import { scheduleIdleTask } from '../../_utils/scheduleIdleTask.js'
+  import { mark, stop } from '../../_utils/marks.js'
+  import { selectionChange } from '../../_utils/events.js'
   import {
     clickSelectedAutosuggestionUsername,
     clickSelectedAutosuggestionEmoji, clickSelectedAutosuggestionHashtag
-  } from '../../_actions/autosuggest'
+  } from '../../_actions/autosuggest.js'
   import { observe } from 'svelte-extras'
-  import { get } from '../../_utils/lodash-lite'
-  import { on } from '../../_utils/eventBus'
-  import { requestPostAnimationFrame } from '../../_utils/requestPostAnimationFrame'
-  import { throttleTimer } from '../../_utils/throttleTimer'
-  import { isWebKit } from '../../_utils/userAgent/isWebKit'
+  import { get } from '../../_utils/lodash-lite.js'
+  import { on } from '../../_utils/eventBus.js'
+  import { requestPostAnimationFrame } from '../../_utils/requestPostAnimationFrame.js'
+  import { throttleTimer } from '../../_utils/throttleTimer.js'
+  import { isWebKit } from '../../_utils/userAgent/isWebKit.js'
 
   const updateComposeTextInStore = throttleTimer(scheduleIdleTask)
 
diff --git a/src/routes/_components/compose/ComposeLengthGauge.html b/src/routes/_components/compose/ComposeLengthGauge.html
index 266de1ce..9090f92e 100644
--- a/src/routes/_components/compose/ComposeLengthGauge.html
+++ b/src/routes/_components/compose/ComposeLengthGauge.html
@@ -5,7 +5,7 @@
 />
 <script>
   import LengthGauge from '../LengthGauge.html'
-  import { store } from '../../_store/store'
+  import { store } from '../../_store/store.js'
 
   export default {
     components: {
diff --git a/src/routes/_components/compose/ComposeLengthIndicator.html b/src/routes/_components/compose/ComposeLengthIndicator.html
index bb8e03f8..67ca4afc 100644
--- a/src/routes/_components/compose/ComposeLengthIndicator.html
+++ b/src/routes/_components/compose/ComposeLengthIndicator.html
@@ -5,7 +5,7 @@
   style="grid-area: length; justify-self: right; align-self: center;"
 />
 <script>
-  import { store } from '../../_store/store'
+  import { store } from '../../_store/store.js'
   import LengthIndicator from '../LengthIndicator.html'
 
   export default {
diff --git a/src/routes/_components/compose/ComposeMedia.html b/src/routes/_components/compose/ComposeMedia.html
index 4a6099e0..4b2171b1 100644
--- a/src/routes/_components/compose/ComposeMedia.html
+++ b/src/routes/_components/compose/ComposeMedia.html
@@ -23,7 +23,7 @@
   }
 </style>
 <script>
-  import { store } from '../../_store/store'
+  import { store } from '../../_store/store.js'
   import ComposeMediaItem from './ComposeMediaItem.html'
 
   export default {
diff --git a/src/routes/_components/compose/ComposeMediaItem.html b/src/routes/_components/compose/ComposeMediaItem.html
index 65cf8fce..f2a384cc 100644
--- a/src/routes/_components/compose/ComposeMediaItem.html
+++ b/src/routes/_components/compose/ComposeMediaItem.html
@@ -121,17 +121,17 @@
   }
 </style>
 <script>
-  import { store } from '../../_store/store'
-  import { deleteMedia } from '../../_actions/media'
-  import { scheduleIdleTask } from '../../_utils/scheduleIdleTask'
+  import { store } from '../../_store/store.js'
+  import { deleteMedia } from '../../_actions/media.js'
+  import { scheduleIdleTask } from '../../_utils/scheduleIdleTask.js'
   import { observe } from 'svelte-extras'
   import SvgIcon from '../SvgIcon.html'
-  import { autosize } from '../../_thirdparty/autosize/autosize'
-  import { ONE_TRANSPARENT_PIXEL } from '../../_static/media'
-  import { get } from '../../_utils/lodash-lite'
-  import { coordsToPercent } from '../../_utils/coordsToPercent'
+  import { autosize } from '../../_thirdparty/autosize/autosize.js'
+  import { ONE_TRANSPARENT_PIXEL } from '../../_static/media.js'
+  import { get } from '../../_utils/lodash-lite.js'
+  import { coordsToPercent } from '../../_utils/coordsToPercent.js'
   import { importShowMediaEditDialog } from '../dialog/asyncDialogs/importShowMediaEditDialog.js'
-  import { throttleTimer } from '../../_utils/throttleTimer'
+  import { throttleTimer } from '../../_utils/throttleTimer.js'
 
   const updateMediaInStore = throttleTimer(scheduleIdleTask)
   const resizeTextarea = process.browser && throttleTimer(requestAnimationFrame)
diff --git a/src/routes/_components/compose/ComposeMediaSensitive.html b/src/routes/_components/compose/ComposeMediaSensitive.html
index a16abbb0..3d240215 100644
--- a/src/routes/_components/compose/ComposeMediaSensitive.html
+++ b/src/routes/_components/compose/ComposeMediaSensitive.html
@@ -41,7 +41,7 @@
 </style>
 <script>
   import { observe } from 'svelte-extras'
-  import { scheduleIdleTask } from '../../_utils/scheduleIdleTask'
+  import { scheduleIdleTask } from '../../_utils/scheduleIdleTask.js'
 
   export default {
     oncreate () {
diff --git a/src/routes/_components/compose/ComposePoll.html b/src/routes/_components/compose/ComposePoll.html
index 14dda6f7..c8be9799 100644
--- a/src/routes/_components/compose/ComposePoll.html
+++ b/src/routes/_components/compose/ComposePoll.html
@@ -77,10 +77,10 @@
 <script>
   import IconButton from '../IconButton.html'
   import Select from '../Select.html'
-  import { store } from '../../_store/store'
-  import { scheduleIdleTask } from '../../_utils/scheduleIdleTask'
-  import { POLL_EXPIRY_DEFAULT, POLL_EXPIRY_OPTIONS } from '../../_static/polls'
-  import { formatIntl } from '../../_utils/formatIntl'
+  import { store } from '../../_store/store.js'
+  import { scheduleIdleTask } from '../../_utils/scheduleIdleTask.js'
+  import { POLL_EXPIRY_DEFAULT, POLL_EXPIRY_OPTIONS } from '../../_static/polls.js'
+  import { formatIntl } from '../../_utils/formatIntl.js'
 
   function flushPollOptionsToDom (poll, realm) {
     for (let i = 0; i < poll.options.length; i++) {
diff --git a/src/routes/_components/compose/ComposeStickyButton.html b/src/routes/_components/compose/ComposeStickyButton.html
index 5e444eb5..e5bf3cac 100644
--- a/src/routes/_components/compose/ComposeStickyButton.html
+++ b/src/routes/_components/compose/ComposeStickyButton.html
@@ -30,10 +30,10 @@
 </style>
 <script>
   import ComposeButton from './ComposeButton.html'
-  import { store } from '../../_store/store'
+  import { store } from '../../_store/store.js'
   import { importShowComposeDialog } from '../dialog/asyncDialogs/importShowComposeDialog.js'
   import { observe } from 'svelte-extras'
-  import { classname } from '../../_utils/classname'
+  import { classname } from '../../_utils/classname.js'
 
   export default {
     oncreate () {
diff --git a/src/routes/_components/compose/ComposeToolbar.html b/src/routes/_components/compose/ComposeToolbar.html
index f3f68543..88605303 100644
--- a/src/routes/_components/compose/ComposeToolbar.html
+++ b/src/routes/_components/compose/ComposeToolbar.html
@@ -71,15 +71,15 @@
 </style>
 <script>
   import IconButton from '../IconButton.html'
-  import { store } from '../../_store/store'
-  import { importShowEmojiDialog } from '../dialog/asyncDialogs/importShowEmojiDialog'
-  import { importShowPostPrivacyDialog } from '../dialog/asyncDialogs/importShowPostPrivacyDialog'
-  import { doMediaUpload } from '../../_actions/media'
-  import { toggleContentWarningShown } from '../../_actions/contentWarnings'
-  import { mediaAccept } from '../../_static/media'
-  import { enablePoll, disablePoll } from '../../_actions/composePoll'
-  import { updateCustomEmojiForInstance } from '../../_actions/emoji'
-  import { formatIntl } from '../../_utils/formatIntl'
+  import { store } from '../../_store/store.js'
+  import { importShowEmojiDialog } from '../dialog/asyncDialogs/importShowEmojiDialog.js'
+  import { importShowPostPrivacyDialog } from '../dialog/asyncDialogs/importShowPostPrivacyDialog.js'
+  import { doMediaUpload } from '../../_actions/media.js'
+  import { toggleContentWarningShown } from '../../_actions/contentWarnings.js'
+  import { mediaAccept } from '../../_static/media.js'
+  import { enablePoll, disablePoll } from '../../_actions/composePoll.js'
+  import { updateCustomEmojiForInstance } from '../../_actions/emoji.js'
+  import { formatIntl } from '../../_utils/formatIntl.js'
 
   export default {
     components: {
diff --git a/src/routes/_components/compose/LazyComposeBox.html b/src/routes/_components/compose/LazyComposeBox.html
index a0bc9388..beb62e6f 100644
--- a/src/routes/_components/compose/LazyComposeBox.html
+++ b/src/routes/_components/compose/LazyComposeBox.html
@@ -2,8 +2,8 @@
   <svelte:component this={composeBox} {realm} {hidden} />
 {/if}
 <script>
-  import { importComposeBox } from '../../_utils/asyncModules/importComposeBox'
-  import { importLoggedInStoreExtensions } from '../../_utils/asyncModules/importLoggedInStoreExtensions'
+  import { importComposeBox } from '../../_utils/asyncModules/importComposeBox.js'
+  import { importLoggedInStoreExtensions } from '../../_utils/asyncModules/importLoggedInStoreExtensions.js'
 
   export default {
     async oncreate () {
diff --git a/src/routes/_components/dialog/asyncDialogs/importShowAccountProfileOptionsDialog.js b/src/routes/_components/dialog/asyncDialogs/importShowAccountProfileOptionsDialog.js
index c8fcb42c..b759f372 100644
--- a/src/routes/_components/dialog/asyncDialogs/importShowAccountProfileOptionsDialog.js
+++ b/src/routes/_components/dialog/asyncDialogs/importShowAccountProfileOptionsDialog.js
@@ -1,3 +1,3 @@
 export const importShowAccountProfileOptionsDialog = () => import(
-  '../creators/showAccountProfileOptionsDialog'
+  '../creators/showAccountProfileOptionsDialog.js'
 ).then(mod => mod.default)
diff --git a/src/routes/_components/dialog/asyncDialogs/importShowComposeDialog.js b/src/routes/_components/dialog/asyncDialogs/importShowComposeDialog.js
index cebc8eee..9f5d33f5 100644
--- a/src/routes/_components/dialog/asyncDialogs/importShowComposeDialog.js
+++ b/src/routes/_components/dialog/asyncDialogs/importShowComposeDialog.js
@@ -1,3 +1,3 @@
 export const importShowComposeDialog = () => import(
-  '../creators/showComposeDialog'
+  '../creators/showComposeDialog.js'
 ).then(mod => mod.default)
diff --git a/src/routes/_components/dialog/asyncDialogs/importShowCopyDialog.js b/src/routes/_components/dialog/asyncDialogs/importShowCopyDialog.js
index 08cd4805..14512717 100644
--- a/src/routes/_components/dialog/asyncDialogs/importShowCopyDialog.js
+++ b/src/routes/_components/dialog/asyncDialogs/importShowCopyDialog.js
@@ -1,3 +1,3 @@
 export const importShowCopyDialog = () => import(
-  '../creators/showCopyDialog'
+  '../creators/showCopyDialog.js'
 ).then(mod => mod.default)
diff --git a/src/routes/_components/dialog/asyncDialogs/importShowEmojiDialog.js b/src/routes/_components/dialog/asyncDialogs/importShowEmojiDialog.js
index 1251f1da..19671c0c 100644
--- a/src/routes/_components/dialog/asyncDialogs/importShowEmojiDialog.js
+++ b/src/routes/_components/dialog/asyncDialogs/importShowEmojiDialog.js
@@ -1,3 +1,3 @@
 export const importShowEmojiDialog = () => import(
-  '../creators/showEmojiDialog'
+  '../creators/showEmojiDialog.js'
 ).then(mod => mod.default)
diff --git a/src/routes/_components/dialog/asyncDialogs/importShowMediaDialog.js b/src/routes/_components/dialog/asyncDialogs/importShowMediaDialog.js
index 2aac8c23..418ddc39 100644
--- a/src/routes/_components/dialog/asyncDialogs/importShowMediaDialog.js
+++ b/src/routes/_components/dialog/asyncDialogs/importShowMediaDialog.js
@@ -1,3 +1,3 @@
 export const importShowMediaDialog = () => import(
-  '../creators/showMediaDialog'
+  '../creators/showMediaDialog.js'
 ).then(mod => mod.default)
diff --git a/src/routes/_components/dialog/asyncDialogs/importShowMediaEditDialog.js b/src/routes/_components/dialog/asyncDialogs/importShowMediaEditDialog.js
index 6ed668e5..e53a5f19 100644
--- a/src/routes/_components/dialog/asyncDialogs/importShowMediaEditDialog.js
+++ b/src/routes/_components/dialog/asyncDialogs/importShowMediaEditDialog.js
@@ -1,3 +1,3 @@
 export const importShowMediaEditDialog = () => import(
-  '../creators/showMediaEditDialog'
+  '../creators/showMediaEditDialog.js'
 ).then(mod => mod.default)
diff --git a/src/routes/_components/dialog/asyncDialogs/importShowMuteDialog.js b/src/routes/_components/dialog/asyncDialogs/importShowMuteDialog.js
index f18a7ade..9f7aaf4a 100644
--- a/src/routes/_components/dialog/asyncDialogs/importShowMuteDialog.js
+++ b/src/routes/_components/dialog/asyncDialogs/importShowMuteDialog.js
@@ -1,3 +1,3 @@
 export const importShowMuteDialog = () => import(
-  '../creators/showMuteDialog'
+  '../creators/showMuteDialog.js'
 ).then(mod => mod.default)
diff --git a/src/routes/_components/dialog/asyncDialogs/importShowPostPrivacyDialog.js b/src/routes/_components/dialog/asyncDialogs/importShowPostPrivacyDialog.js
index 403d5368..6ac52c08 100644
--- a/src/routes/_components/dialog/asyncDialogs/importShowPostPrivacyDialog.js
+++ b/src/routes/_components/dialog/asyncDialogs/importShowPostPrivacyDialog.js
@@ -1,3 +1,3 @@
 export const importShowPostPrivacyDialog = () => import(
-  '../creators/showPostPrivacyDialog'
+  '../creators/showPostPrivacyDialog.js'
 ).then(mod => mod.default)
diff --git a/src/routes/_components/dialog/asyncDialogs/importShowReportDialog.js b/src/routes/_components/dialog/asyncDialogs/importShowReportDialog.js
index 980335d8..f2c29958 100644
--- a/src/routes/_components/dialog/asyncDialogs/importShowReportDialog.js
+++ b/src/routes/_components/dialog/asyncDialogs/importShowReportDialog.js
@@ -1,3 +1,3 @@
 export const importShowReportDialog = () => import(
-  '../creators/showReportDialog'
+  '../creators/showReportDialog.js'
 ).then(mod => mod.default)
diff --git a/src/routes/_components/dialog/asyncDialogs/importShowShortcutHelpDialog.js b/src/routes/_components/dialog/asyncDialogs/importShowShortcutHelpDialog.js
index 007e6a93..623d4f17 100644
--- a/src/routes/_components/dialog/asyncDialogs/importShowShortcutHelpDialog.js
+++ b/src/routes/_components/dialog/asyncDialogs/importShowShortcutHelpDialog.js
@@ -1,3 +1,3 @@
 export const importShowShortcutHelpDialog = () => import(
-  '../creators/showShortcutHelpDialog'
+  '../creators/showShortcutHelpDialog.js'
 ).then(mod => mod.default)
diff --git a/src/routes/_components/dialog/asyncDialogs/importShowStatusOptionsDialog.js b/src/routes/_components/dialog/asyncDialogs/importShowStatusOptionsDialog.js
index bb0df2b9..e8daebbe 100644
--- a/src/routes/_components/dialog/asyncDialogs/importShowStatusOptionsDialog.js
+++ b/src/routes/_components/dialog/asyncDialogs/importShowStatusOptionsDialog.js
@@ -1,3 +1,3 @@
 export const importShowStatusOptionsDialog = () => import(
-  '../creators/showStatusOptionsDialog'
+  '../creators/showStatusOptionsDialog.js'
 ).then(mod => mod.default)
diff --git a/src/routes/_components/dialog/asyncDialogs/importShowTextConfirmationDialog.js b/src/routes/_components/dialog/asyncDialogs/importShowTextConfirmationDialog.js
index 12bf505d..bcb1ce95 100644
--- a/src/routes/_components/dialog/asyncDialogs/importShowTextConfirmationDialog.js
+++ b/src/routes/_components/dialog/asyncDialogs/importShowTextConfirmationDialog.js
@@ -1,3 +1,3 @@
 export const importShowTextConfirmationDialog = () => import(
-  '../creators/showTextConfirmationDialog'
+  '../creators/showTextConfirmationDialog.js'
 ).then(mod => mod.default)
diff --git a/src/routes/_components/dialog/asyncDialogs/importShowWordFilterDialog.js b/src/routes/_components/dialog/asyncDialogs/importShowWordFilterDialog.js
index f46dbb72..7909cb68 100644
--- a/src/routes/_components/dialog/asyncDialogs/importShowWordFilterDialog.js
+++ b/src/routes/_components/dialog/asyncDialogs/importShowWordFilterDialog.js
@@ -1,3 +1,3 @@
 export const importShowWordFilterDialog = () => import(
-  '../creators/showWordFilterDialog'
+  '../creators/showWordFilterDialog.js'
 ).then(mod => mod.default)
diff --git a/src/routes/_components/dialog/components/AccountProfileOptionsDialog.html b/src/routes/_components/dialog/components/AccountProfileOptionsDialog.html
index 7f1fa502..c369083d 100644
--- a/src/routes/_components/dialog/components/AccountProfileOptionsDialog.html
+++ b/src/routes/_components/dialog/components/AccountProfileOptionsDialog.html
@@ -9,20 +9,20 @@
 </ModalDialog>
 <script>
 import ModalDialog from './ModalDialog.html'
-import { store } from '../../../_store/store'
+import { store } from '../../../_store/store.js'
 import GenericDialogList from './GenericDialogList.html'
-import { show } from '../helpers/showDialog'
-import { close } from '../helpers/closeDialog'
-import { oncreate } from '../helpers/onCreateDialog'
-import { setAccountBlocked } from '../../../_actions/block'
-import { setAccountFollowed } from '../../../_actions/follow'
-import { setShowReblogs } from '../../../_actions/setShowReblogs'
-import { setDomainBlocked } from '../../../_actions/setDomainBlocked'
-import { copyText } from '../../../_actions/copyText'
-import { composeNewStatusMentioning } from '../../../_actions/mention'
-import { toggleMute } from '../../../_actions/toggleMute'
-import { reportStatusOrAccount } from '../../../_actions/report'
-import { formatIntl } from '../../../_utils/formatIntl'
+import { show } from '../helpers/showDialog.js'
+import { close } from '../helpers/closeDialog.js'
+import { oncreate } from '../helpers/onCreateDialog.js'
+import { setAccountBlocked } from '../../../_actions/block.js'
+import { setAccountFollowed } from '../../../_actions/follow.js'
+import { setShowReblogs } from '../../../_actions/setShowReblogs.js'
+import { setDomainBlocked } from '../../../_actions/setDomainBlocked.js'
+import { copyText } from '../../../_actions/copyText.js'
+import { composeNewStatusMentioning } from '../../../_actions/mention.js'
+import { toggleMute } from '../../../_actions/toggleMute.js'
+import { reportStatusOrAccount } from '../../../_actions/report.js'
+import { formatIntl } from '../../../_utils/formatIntl.js'
 
 export default {
   oncreate,
diff --git a/src/routes/_components/dialog/components/ComposeDialog.html b/src/routes/_components/dialog/components/ComposeDialog.html
index a3b6d2ac..49d1aca7 100644
--- a/src/routes/_components/dialog/components/ComposeDialog.html
+++ b/src/routes/_components/dialog/components/ComposeDialog.html
@@ -10,10 +10,10 @@
 <script>
   import ModalDialog from './ModalDialog.html'
   import ComposeBox from '../../compose/ComposeBox.html'
-  import { on, emit } from '../../../_utils/eventBus'
-  import { show } from '../helpers/showDialog'
-  import { oncreate as onCreateDialog } from '../helpers/onCreateDialog'
-  import { close } from '../helpers/closeDialog'
+  import { on, emit } from '../../../_utils/eventBus.js'
+  import { show } from '../helpers/showDialog.js'
+  import { oncreate as onCreateDialog } from '../helpers/onCreateDialog.js'
+  import { close } from '../helpers/closeDialog.js'
 
   export default {
     oncreate () {
diff --git a/src/routes/_components/dialog/components/ConfirmationDialog.html b/src/routes/_components/dialog/components/ConfirmationDialog.html
index 65830dd1..711bcc4d 100644
--- a/src/routes/_components/dialog/components/ConfirmationDialog.html
+++ b/src/routes/_components/dialog/components/ConfirmationDialog.html
@@ -37,10 +37,10 @@
 </style>
 <script>
   import ModalDialog from './ModalDialog.html'
-  import { show } from '../helpers/showDialog'
-  import { close } from '../helpers/closeDialog'
-  import { on } from '../../../_utils/eventBus'
-  import { oncreate as onCreateDialog } from '../helpers/onCreateDialog'
+  import { show } from '../helpers/showDialog.js'
+  import { close } from '../helpers/closeDialog.js'
+  import { on } from '../../../_utils/eventBus.js'
+  import { oncreate as onCreateDialog } from '../helpers/onCreateDialog.js'
 
   export default {
     oncreate () {
diff --git a/src/routes/_components/dialog/components/CopyDialog.html b/src/routes/_components/dialog/components/CopyDialog.html
index 2281941b..7fe57178 100644
--- a/src/routes/_components/dialog/components/CopyDialog.html
+++ b/src/routes/_components/dialog/components/CopyDialog.html
@@ -28,11 +28,11 @@
 </style>
 <script>
   import ModalDialog from './ModalDialog.html'
-  import { show } from '../helpers/showDialog'
-  import { close } from '../helpers/closeDialog'
-  import { oncreate as onCreateDialog } from '../helpers/onCreateDialog'
-  import { toast } from '../../toast/toast'
-  import { doubleRAF } from '../../../_utils/doubleRAF'
+  import { show } from '../helpers/showDialog.js'
+  import { close } from '../helpers/closeDialog.js'
+  import { oncreate as onCreateDialog } from '../helpers/onCreateDialog.js'
+  import { toast } from '../../toast/toast.js'
+  import { doubleRAF } from '../../../_utils/doubleRAF.js'
 
   function copyFromInput (input) {
     // workarounds for iOS, via https://stackoverflow.com/a/34046084
diff --git a/src/routes/_components/dialog/components/EmojiDialog.html b/src/routes/_components/dialog/components/EmojiDialog.html
index 4a988916..5f75ec21 100644
--- a/src/routes/_components/dialog/components/EmojiDialog.html
+++ b/src/routes/_components/dialog/components/EmojiDialog.html
@@ -55,19 +55,19 @@
 </style>
 <script>
   import ModalDialog from './ModalDialog.html'
-  import { store } from '../../../_store/store'
-  import { insertEmoji } from '../../../_actions/emoji'
-  import { show } from '../helpers/showDialog'
-  import { close } from '../helpers/closeDialog'
-  import { oncreate as onCreateDialog } from '../helpers/onCreateDialog'
-  import { isDarkTheme } from '../../../_utils/isDarkTheme'
+  import { store } from '../../../_store/store.js'
+  import { insertEmoji } from '../../../_actions/emoji.js'
+  import { show } from '../helpers/showDialog.js'
+  import { close } from '../helpers/closeDialog.js'
+  import { oncreate as onCreateDialog } from '../helpers/onCreateDialog.js'
+  import { isDarkTheme } from '../../../_utils/isDarkTheme.js'
   import 'emoji-picker-element/picker'
-  import { registerShadowRoot, unregisterShadowRoot } from '../../../_thirdparty/a11y-dialog/a11y-dialog'
-  import { doubleRAF } from '../../../_utils/doubleRAF'
-  import { convertCustomEmojiToEmojiPickerFormat } from '../../../_utils/convertCustomEmojiToEmojiPickerFormat'
-  import { supportsFocusVisible } from '../../../_utils/supportsFocusVisible'
-  import { importFocusVisible } from '../../../_utils/polyfills/asyncPolyfills'
-  import { emojiPickerI18n, emojiPickerDataSource, emojiPickerLocale } from '../../../_static/emojiPickerIntl'
+  import { registerShadowRoot, unregisterShadowRoot } from '../../../_thirdparty/a11y-dialog/a11y-dialog.js'
+  import { doubleRAF } from '../../../_utils/doubleRAF.js'
+  import { convertCustomEmojiToEmojiPickerFormat } from '../../../_utils/convertCustomEmojiToEmojiPickerFormat.js'
+  import { supportsFocusVisible } from '../../../_utils/supportsFocusVisible.js'
+  import { importFocusVisible } from '../../../_utils/polyfills/asyncPolyfills.js'
+  import { emojiPickerI18n, emojiPickerDataSource, emojiPickerLocale } from '../../../_static/emojiPickerIntl.js'
 
   export default {
     async oncreate () {
diff --git a/src/routes/_components/dialog/components/GenericConfirmationDialog.html b/src/routes/_components/dialog/components/GenericConfirmationDialog.html
index b7e5e980..76cad36e 100644
--- a/src/routes/_components/dialog/components/GenericConfirmationDialog.html
+++ b/src/routes/_components/dialog/components/GenericConfirmationDialog.html
@@ -31,10 +31,10 @@
 </style>
 <script>
   import ModalDialog from './ModalDialog.html'
-  import { show } from '../helpers/showDialog'
-  import { close } from '../helpers/closeDialog'
-  import { on } from '../../../_utils/eventBus'
-  import { oncreate as onCreateDialog } from '../helpers/onCreateDialog'
+  import { show } from '../helpers/showDialog.js'
+  import { close } from '../helpers/closeDialog.js'
+  import { on } from '../../../_utils/eventBus.js'
+  import { oncreate as onCreateDialog } from '../helpers/onCreateDialog.js'
 
   export default {
     oncreate () {
diff --git a/src/routes/_components/dialog/components/MediaAltEditor.html b/src/routes/_components/dialog/components/MediaAltEditor.html
index 2a154fa7..27393a8d 100644
--- a/src/routes/_components/dialog/components/MediaAltEditor.html
+++ b/src/routes/_components/dialog/components/MediaAltEditor.html
@@ -92,22 +92,22 @@
   }
 </style>
 <script>
-  import { requestPostAnimationFrame } from '../../../_utils/requestPostAnimationFrame'
-  import { mark, stop } from '../../../_utils/marks'
-  import { autosize } from '../../../_thirdparty/autosize/autosize'
+  import { requestPostAnimationFrame } from '../../../_utils/requestPostAnimationFrame.js'
+  import { mark, stop } from '../../../_utils/marks.js'
+  import { autosize } from '../../../_thirdparty/autosize/autosize.js'
   import { observe } from 'svelte-extras'
-  import { throttleTimer } from '../../../_utils/throttleTimer'
-  import { get } from '../../../_utils/lodash-lite'
-  import { store } from '../../../_store/store'
-  import { MEDIA_ALT_CHAR_LIMIT } from '../../../_static/media'
+  import { throttleTimer } from '../../../_utils/throttleTimer.js'
+  import { get } from '../../../_utils/lodash-lite.js'
+  import { store } from '../../../_store/store.js'
+  import { MEDIA_ALT_CHAR_LIMIT } from '../../../_static/media.js'
   import LengthGauge from '../../LengthGauge.html'
   import LengthIndicator from '../../LengthIndicator.html'
   import { length } from 'stringz'
-  import { runTesseract } from '../../../_utils/runTesseract'
+  import { runTesseract } from '../../../_utils/runTesseract.js'
   import SvgIcon from '../../SvgIcon.html'
-  import { toast } from '../../toast/toast'
-  import { formatIntl } from '../../../_utils/formatIntl'
-  import { database } from '../../../_database/database'
+  import { toast } from '../../toast/toast.js'
+  import { formatIntl } from '../../../_utils/formatIntl.js'
+  import { database } from '../../../_database/database.js'
 
   const updateRawTextInStore = throttleTimer(requestPostAnimationFrame)
 
diff --git a/src/routes/_components/dialog/components/MediaDialog.html b/src/routes/_components/dialog/components/MediaDialog.html
index c672f51c..33118acb 100644
--- a/src/routes/_components/dialog/components/MediaDialog.html
+++ b/src/routes/_components/dialog/components/MediaDialog.html
@@ -235,16 +235,15 @@
   import IconButton from '../../IconButton.html'
   import Shortcut from '../../shortcut/Shortcut.html'
   import PinchZoomable from './PinchZoomable.html'
-  import { show } from '../helpers/showDialog'
-  import { oncreate as onCreateDialog } from '../helpers/onCreateDialog'
-  import { close } from '../helpers/closeDialog'
-  import debounce from 'lodash-es/debounce'
-  import times from 'lodash-es/times'
-  import { smoothScroll, hasNativeSmoothScroll } from '../../../_utils/smoothScroll'
-  import { store } from '../../../_store/store'
-  import { intrinsicScale } from '../../../_thirdparty/intrinsic-scale/intrinsicScale'
-  import { get } from '../../../_utils/lodash-lite'
-  import { formatIntl } from '../../../_utils/formatIntl'
+  import { show } from '../helpers/showDialog.js'
+  import { oncreate as onCreateDialog } from '../helpers/onCreateDialog.js'
+  import { close } from '../helpers/closeDialog.js'
+  import { debounce } from '../../../_thirdparty/lodash/timers.js'
+  import { times, get } from '../../../_utils/lodash-lite.js'
+  import { smoothScroll, hasNativeSmoothScroll } from '../../../_utils/smoothScroll.js'
+  import { store } from '../../../_store/store.js'
+  import { intrinsicScale } from '../../../_thirdparty/intrinsic-scale/intrinsicScale.js'
+  import { formatIntl } from '../../../_utils/formatIntl.js'
 
   // padding for .media-scroll-item-image-area
   const IMAGE_AREA_PADDING = {
diff --git a/src/routes/_components/dialog/components/MediaEditDialog.html b/src/routes/_components/dialog/components/MediaEditDialog.html
index b07776d9..9e6a324b 100644
--- a/src/routes/_components/dialog/components/MediaEditDialog.html
+++ b/src/routes/_components/dialog/components/MediaEditDialog.html
@@ -93,13 +93,13 @@
 </style>
 <script>
   import ModalDialog from './ModalDialog.html'
-  import { show } from '../helpers/showDialog'
-  import { close } from '../helpers/closeDialog'
-  import { oncreate } from '../helpers/onCreateDialog'
+  import { show } from '../helpers/showDialog.js'
+  import { close } from '../helpers/closeDialog.js'
+  import { oncreate } from '../helpers/onCreateDialog.js'
   import MediaFocalPointEditor from '../components/MediaFocalPointEditor.html'
   import MediaAltEditor from '../components/MediaAltEditor.html'
-  import { store } from '../../../_store/store'
-  import { get } from '../../../_utils/lodash-lite'
+  import { store } from '../../../_store/store.js'
+  import { get } from '../../../_utils/lodash-lite.js'
 
   export default {
     oncreate,
diff --git a/src/routes/_components/dialog/components/MediaFocalPointEditor.html b/src/routes/_components/dialog/components/MediaFocalPointEditor.html
index e8279749..255b43fb 100644
--- a/src/routes/_components/dialog/components/MediaFocalPointEditor.html
+++ b/src/routes/_components/dialog/components/MediaFocalPointEditor.html
@@ -174,14 +174,14 @@
   }
 </style>
 <script>
-  import { store } from '../../../_store/store'
-  import { get } from '../../../_utils/lodash-lite'
+  import { store } from '../../../_store/store.js'
+  import { get } from '../../../_utils/lodash-lite.js'
   import { observe } from 'svelte-extras'
-  import { scheduleIdleTask } from '../../../_utils/scheduleIdleTask'
-  import { coordsToPercent, percentToCoords } from '../../../_utils/coordsToPercent'
+  import { scheduleIdleTask } from '../../../_utils/scheduleIdleTask.js'
+  import { coordsToPercent, percentToCoords } from '../../../_utils/coordsToPercent.js'
   import SvgIcon from '../../SvgIcon.html'
-  import { intrinsicScale } from '../../../_thirdparty/intrinsic-scale/intrinsicScale'
-  import { resize } from '../../../_utils/events'
+  import { intrinsicScale } from '../../../_thirdparty/intrinsic-scale/intrinsicScale.js'
+  import { resize } from '../../../_utils/events.js'
   import Draggable from '../../Draggable.html'
 
   const parseAndValidateFloat = rawText => {
diff --git a/src/routes/_components/dialog/components/MediaInDialog.html b/src/routes/_components/dialog/components/MediaInDialog.html
index 17e089be..bced8ded 100644
--- a/src/routes/_components/dialog/components/MediaInDialog.html
+++ b/src/routes/_components/dialog/components/MediaInDialog.html
@@ -74,7 +74,7 @@
   }
 </style>
 <script>
-  import { get } from '../../../_utils/lodash-lite'
+  import { get } from '../../../_utils/lodash-lite.js'
   import MediaControlsFix from '../../MediaControlsFix.html'
 
   export default {
diff --git a/src/routes/_components/dialog/components/ModalDialog.html b/src/routes/_components/dialog/components/ModalDialog.html
index 062a64fa..946640f5 100644
--- a/src/routes/_components/dialog/components/ModalDialog.html
+++ b/src/routes/_components/dialog/components/ModalDialog.html
@@ -154,13 +154,13 @@
 <script>
   import Shortcut from '../../shortcut/Shortcut.html'
   import SvgIcon from '../../SvgIcon.html'
-  import { A11yDialog } from '../../../_thirdparty/a11y-dialog/a11y-dialog'
-  import { classname } from '../../../_utils/classname'
-  import { on, emit } from '../../../_utils/eventBus'
+  import { A11yDialog } from '../../../_thirdparty/a11y-dialog/a11y-dialog.js'
+  import { classname } from '../../../_utils/classname.js'
+  import { on, emit } from '../../../_utils/eventBus.js'
   import {
     pushShortcutScope,
     popShortcutScope
-  } from '../../../_utils/shortcuts'
+  } from '../../../_utils/shortcuts.js'
 
   export default {
     oncreate () {
diff --git a/src/routes/_components/dialog/components/MuteDialog.html b/src/routes/_components/dialog/components/MuteDialog.html
index e6e4949d..a070fbff 100644
--- a/src/routes/_components/dialog/components/MuteDialog.html
+++ b/src/routes/_components/dialog/components/MuteDialog.html
@@ -28,11 +28,11 @@
 </style>
 <script>
   import GenericConfirmationDialog from './GenericConfirmationDialog.html'
-  import { show } from '../helpers/showDialog'
-  import { close } from '../helpers/closeDialog'
-  import { oncreate } from '../helpers/onCreateDialog'
-  import { setAccountMuted } from '../../../_actions/mute'
-  import { formatIntl } from '../../../_utils/formatIntl'
+  import { show } from '../helpers/showDialog.js'
+  import { close } from '../helpers/closeDialog.js'
+  import { oncreate } from '../helpers/onCreateDialog.js'
+  import { setAccountMuted } from '../../../_actions/mute.js'
+  import { formatIntl } from '../../../_utils/formatIntl.js'
 
   export default {
     oncreate,
diff --git a/src/routes/_components/dialog/components/PostPrivacyDialog.html b/src/routes/_components/dialog/components/PostPrivacyDialog.html
index 706914f2..b17a2114 100644
--- a/src/routes/_components/dialog/components/PostPrivacyDialog.html
+++ b/src/routes/_components/dialog/components/PostPrivacyDialog.html
@@ -9,13 +9,13 @@
 </ModalDialog>
 <script>
   import ModalDialog from './ModalDialog.html'
-  import { store } from '../../../_store/store'
-  import { POST_PRIVACY_OPTIONS } from '../../../_static/statuses'
-  import { setPostPrivacy } from '../../../_actions/postPrivacy'
+  import { store } from '../../../_store/store.js'
+  import { POST_PRIVACY_OPTIONS } from '../../../_static/statuses.js'
+  import { setPostPrivacy } from '../../../_actions/postPrivacy.js'
   import GenericDialogList from './GenericDialogList.html'
-  import { show } from '../helpers/showDialog'
-  import { close } from '../helpers/closeDialog'
-  import { oncreate } from '../helpers/onCreateDialog'
+  import { show } from '../helpers/showDialog.js'
+  import { close } from '../helpers/closeDialog.js'
+  import { oncreate } from '../helpers/onCreateDialog.js'
 
   export default {
     oncreate,
diff --git a/src/routes/_components/dialog/components/ReportDialog.html b/src/routes/_components/dialog/components/ReportDialog.html
index 7eee9056..34bcc99e 100644
--- a/src/routes/_components/dialog/components/ReportDialog.html
+++ b/src/routes/_components/dialog/components/ReportDialog.html
@@ -156,15 +156,15 @@
 <script>
   import GenericConfirmationDialog from './GenericConfirmationDialog.html'
   import LoadingSpinner from '../../LoadingSpinner.html'
-  import { show } from '../helpers/showDialog'
-  import { close } from '../helpers/closeDialog'
-  import { oncreate as onCreateDialog } from '../helpers/onCreateDialog'
-  import { getRecentStatusesForAccount } from '../../../_actions/getRecentStatusesForAccount'
-  import { statusHtmlToPlainText } from '../../../_utils/statusHtmlToPlainText'
-  import { toast } from '../../toast/toast'
-  import { store } from '../../../_store/store'
-  import { reportStatuses } from '../../../_actions/reportStatuses'
-  import { formatIntl } from '../../../_utils/formatIntl'
+  import { show } from '../helpers/showDialog.js'
+  import { close } from '../helpers/closeDialog.js'
+  import { oncreate as onCreateDialog } from '../helpers/onCreateDialog.js'
+  import { getRecentStatusesForAccount } from '../../../_actions/getRecentStatusesForAccount.js'
+  import { statusHtmlToPlainText } from '../../../_utils/statusHtmlToPlainText.js'
+  import { toast } from '../../toast/toast.js'
+  import { store } from '../../../_store/store.js'
+  import { reportStatuses } from '../../../_actions/reportStatuses.js'
+  import { formatIntl } from '../../../_utils/formatIntl.js'
 
   export default {
     async oncreate () {
diff --git a/src/routes/_components/dialog/components/ShortcutHelpDialog.html b/src/routes/_components/dialog/components/ShortcutHelpDialog.html
index 5f5410ff..393afeab 100644
--- a/src/routes/_components/dialog/components/ShortcutHelpDialog.html
+++ b/src/routes/_components/dialog/components/ShortcutHelpDialog.html
@@ -20,9 +20,9 @@
   import ModalDialog from './ModalDialog.html'
   import ShortcutHelpInfo from '../../ShortcutHelpInfo.html'
   import Shortcut from '../../shortcut/Shortcut.html'
-  import { show } from '../helpers/showDialog'
-  import { close } from '../helpers/closeDialog'
-  import { oncreate } from '../helpers/onCreateDialog'
+  import { show } from '../helpers/showDialog.js'
+  import { close } from '../helpers/closeDialog.js'
+  import { oncreate } from '../helpers/onCreateDialog.js'
 
   export default {
     oncreate,
diff --git a/src/routes/_components/dialog/components/StatusOptionsDialog.html b/src/routes/_components/dialog/components/StatusOptionsDialog.html
index 95890afd..d5b05088 100644
--- a/src/routes/_components/dialog/components/StatusOptionsDialog.html
+++ b/src/routes/_components/dialog/components/StatusOptionsDialog.html
@@ -9,23 +9,23 @@
 </ModalDialog>
 <script>
 import ModalDialog from './ModalDialog.html'
-import { store } from '../../../_store/store'
+import { store } from '../../../_store/store.js'
 import GenericDialogList from './GenericDialogList.html'
-import { setAccountFollowed } from '../../../_actions/follow'
-import { doDeleteStatus } from '../../../_actions/delete'
-import { show } from '../helpers/showDialog'
-import { close } from '../helpers/closeDialog'
-import { oncreate } from '../helpers/onCreateDialog'
-import { setAccountBlocked } from '../../../_actions/block'
-import { setStatusPinnedOrUnpinned } from '../../../_actions/pin'
-import { setStatusBookmarkedOrUnbookmarked } from '../../../_actions/bookmark'
-import { setConversationMuted } from '../../../_actions/muteConversation'
-import { copyText } from '../../../_actions/copyText'
-import { deleteAndRedraft } from '../../../_actions/deleteAndRedraft'
-import { shareStatus } from '../../../_actions/share'
-import { toggleMute } from '../../../_actions/toggleMute'
-import { reportStatusOrAccount } from '../../../_actions/report'
-import { formatIntl } from '../../../_utils/formatIntl'
+import { setAccountFollowed } from '../../../_actions/follow.js'
+import { doDeleteStatus } from '../../../_actions/delete.js'
+import { show } from '../helpers/showDialog.js'
+import { close } from '../helpers/closeDialog.js'
+import { oncreate } from '../helpers/onCreateDialog.js'
+import { setAccountBlocked } from '../../../_actions/block.js'
+import { setStatusPinnedOrUnpinned } from '../../../_actions/pin.js'
+import { setStatusBookmarkedOrUnbookmarked } from '../../../_actions/bookmark.js'
+import { setConversationMuted } from '../../../_actions/muteConversation.js'
+import { copyText } from '../../../_actions/copyText.js'
+import { deleteAndRedraft } from '../../../_actions/deleteAndRedraft.js'
+import { shareStatus } from '../../../_actions/share.js'
+import { toggleMute } from '../../../_actions/toggleMute.js'
+import { reportStatusOrAccount } from '../../../_actions/report.js'
+import { formatIntl } from '../../../_utils/formatIntl.js'
 
 export default {
   oncreate,
diff --git a/src/routes/_components/dialog/components/TextConfirmationDialog.html b/src/routes/_components/dialog/components/TextConfirmationDialog.html
index 89702547..64313b93 100644
--- a/src/routes/_components/dialog/components/TextConfirmationDialog.html
+++ b/src/routes/_components/dialog/components/TextConfirmationDialog.html
@@ -16,9 +16,9 @@
 </style>
 <script>
   import GenericConfirmationDialog from './GenericConfirmationDialog.html'
-  import { show } from '../helpers/showDialog'
-  import { close } from '../helpers/closeDialog'
-  import { oncreate } from '../helpers/onCreateDialog'
+  import { show } from '../helpers/showDialog.js'
+  import { close } from '../helpers/closeDialog.js'
+  import { oncreate } from '../helpers/onCreateDialog.js'
 
   export default {
     oncreate,
diff --git a/src/routes/_components/dialog/components/WordFilterDialog.html b/src/routes/_components/dialog/components/WordFilterDialog.html
index a5fcf762..6ca6e1a5 100644
--- a/src/routes/_components/dialog/components/WordFilterDialog.html
+++ b/src/routes/_components/dialog/components/WordFilterDialog.html
@@ -123,10 +123,10 @@
 <script>
   import GenericConfirmationDialog from './GenericConfirmationDialog.html'
   import Select from '../../Select.html'
-  import { show } from '../helpers/showDialog'
-  import { close } from '../helpers/closeDialog'
-  import { oncreate as onCreateDialog } from '../helpers/onCreateDialog'
-  import { store } from '../../../_store/store'
+  import { show } from '../helpers/showDialog.js'
+  import { close } from '../helpers/closeDialog.js'
+  import { oncreate as onCreateDialog } from '../helpers/onCreateDialog.js'
+  import { store } from '../../../_store/store.js'
   import {
     WORD_FILTER_CONTEXT_ACCOUNT,
     WORD_FILTER_CONTEXT_HOME,
@@ -136,8 +136,8 @@
     WORD_FILTER_CONTEXTS,
     WORD_FILTER_EXPIRY_DEFAULT,
     WORD_FILTER_EXPIRY_OPTIONS
-  } from '../../../_static/wordFilters'
-  import { createOrUpdateFilter } from '../../../_actions/filters'
+  } from '../../../_static/wordFilters.js'
+  import { createOrUpdateFilter } from '../../../_actions/filters.js'
 
   export default {
     async oncreate () {
diff --git a/src/routes/_components/dialog/creators/showAccountProfileOptionsDialog.js b/src/routes/_components/dialog/creators/showAccountProfileOptionsDialog.js
index 48e8d706..d8d9a60c 100644
--- a/src/routes/_components/dialog/creators/showAccountProfileOptionsDialog.js
+++ b/src/routes/_components/dialog/creators/showAccountProfileOptionsDialog.js
@@ -1,5 +1,5 @@
 import AccountProfileOptionsDialog from '../components/AccountProfileOptionsDialog.html'
-import { showDialog } from './showDialog'
+import { showDialog } from './showDialog.js'
 
 export default function showAccountProfileOptionsDialog (account, relationship, verifyCredentials) {
   return showDialog(AccountProfileOptionsDialog, {
diff --git a/src/routes/_components/dialog/creators/showComposeDialog.js b/src/routes/_components/dialog/creators/showComposeDialog.js
index d91323a6..1613bde0 100644
--- a/src/routes/_components/dialog/creators/showComposeDialog.js
+++ b/src/routes/_components/dialog/creators/showComposeDialog.js
@@ -1,5 +1,5 @@
 import ComposeDialog from '../components/ComposeDialog.html'
-import { showDialog } from './showDialog'
+import { showDialog } from './showDialog.js'
 
 export default function showComposeDialog () {
   return showDialog(ComposeDialog, { label: 'intl.composeStatus' })
diff --git a/src/routes/_components/dialog/creators/showCopyDialog.js b/src/routes/_components/dialog/creators/showCopyDialog.js
index 6a9bfa84..a253181d 100644
--- a/src/routes/_components/dialog/creators/showCopyDialog.js
+++ b/src/routes/_components/dialog/creators/showCopyDialog.js
@@ -1,5 +1,5 @@
 import CopyDialog from '../components/CopyDialog.html'
-import { showDialog } from './showDialog'
+import { showDialog } from './showDialog.js'
 
 export default function showCopyDialog (text) {
   return showDialog(CopyDialog, {
diff --git a/src/routes/_components/dialog/creators/showDialog.js b/src/routes/_components/dialog/creators/showDialog.js
index dd2806d8..75500cb6 100644
--- a/src/routes/_components/dialog/creators/showDialog.js
+++ b/src/routes/_components/dialog/creators/showDialog.js
@@ -1,5 +1,5 @@
-import { createDialogElement } from '../helpers/createDialogElement'
-import { createDialogId } from '../helpers/createDialogId'
+import { createDialogElement } from '../helpers/createDialogElement.js'
+import { createDialogId } from '../helpers/createDialogId.js'
 
 export function showDialog (Dialog, data) {
   const dialog = new Dialog({
diff --git a/src/routes/_components/dialog/creators/showEmojiDialog.js b/src/routes/_components/dialog/creators/showEmojiDialog.js
index 8edc17b9..70c1a937 100644
--- a/src/routes/_components/dialog/creators/showEmojiDialog.js
+++ b/src/routes/_components/dialog/creators/showEmojiDialog.js
@@ -1,5 +1,5 @@
 import EmojiDialog from '../components/EmojiDialog.html'
-import { showDialog } from './showDialog'
+import { showDialog } from './showDialog.js'
 
 export default function showEmojiDialog (realm) {
   return showDialog(EmojiDialog, {
diff --git a/src/routes/_components/dialog/creators/showMediaDialog.js b/src/routes/_components/dialog/creators/showMediaDialog.js
index a5cd26fb..44400314 100644
--- a/src/routes/_components/dialog/creators/showMediaDialog.js
+++ b/src/routes/_components/dialog/creators/showMediaDialog.js
@@ -1,5 +1,5 @@
 import MediaDialog from '../components/MediaDialog.html'
-import { showDialog } from './showDialog'
+import { showDialog } from './showDialog.js'
 
 export default function showMediaDialog (mediaItems, scrolledItem) {
   return showDialog(MediaDialog, {
diff --git a/src/routes/_components/dialog/creators/showMediaEditDialog.js b/src/routes/_components/dialog/creators/showMediaEditDialog.js
index 8db018b6..a011b580 100644
--- a/src/routes/_components/dialog/creators/showMediaEditDialog.js
+++ b/src/routes/_components/dialog/creators/showMediaEditDialog.js
@@ -1,5 +1,5 @@
 import MediaFocalPointDialog from '../components/MediaEditDialog.html'
-import { showDialog } from './showDialog'
+import { showDialog } from './showDialog.js'
 
 export default function showMediaEditDialog (realm, index, type) {
   return showDialog(MediaFocalPointDialog, {
diff --git a/src/routes/_components/dialog/creators/showMuteDialog.js b/src/routes/_components/dialog/creators/showMuteDialog.js
index b2934de8..b551f106 100644
--- a/src/routes/_components/dialog/creators/showMuteDialog.js
+++ b/src/routes/_components/dialog/creators/showMuteDialog.js
@@ -1,5 +1,5 @@
 import MuteDialog from '../components/MuteDialog.html'
-import { showDialog } from './showDialog'
+import { showDialog } from './showDialog.js'
 
 export default function showMuteDialog (account) {
   return showDialog(MuteDialog, {
diff --git a/src/routes/_components/dialog/creators/showPostPrivacyDialog.js b/src/routes/_components/dialog/creators/showPostPrivacyDialog.js
index ac9abe5c..07373d6a 100644
--- a/src/routes/_components/dialog/creators/showPostPrivacyDialog.js
+++ b/src/routes/_components/dialog/creators/showPostPrivacyDialog.js
@@ -1,5 +1,5 @@
 import PostPrivacyDialog from '../components/PostPrivacyDialog.html'
-import { showDialog } from './showDialog'
+import { showDialog } from './showDialog.js'
 
 export default function showPostPrivacyDialog (realm) {
   return showDialog(PostPrivacyDialog, {
diff --git a/src/routes/_components/dialog/creators/showReportDialog.js b/src/routes/_components/dialog/creators/showReportDialog.js
index 2beae76a..9670245e 100644
--- a/src/routes/_components/dialog/creators/showReportDialog.js
+++ b/src/routes/_components/dialog/creators/showReportDialog.js
@@ -1,6 +1,6 @@
 import ReportDialog from '../components/ReportDialog.html'
-import { showDialog } from './showDialog'
-import { formatIntl } from '../../../_utils/formatIntl'
+import { showDialog } from './showDialog.js'
+import { formatIntl } from '../../../_utils/formatIntl.js'
 
 export default function showReportDialog ({ account, status }) {
   const label = formatIntl('intl.reportAccount', { account: `@${account.acct}` })
diff --git a/src/routes/_components/dialog/creators/showShortcutHelpDialog.js b/src/routes/_components/dialog/creators/showShortcutHelpDialog.js
index f9165cee..51f611fd 100644
--- a/src/routes/_components/dialog/creators/showShortcutHelpDialog.js
+++ b/src/routes/_components/dialog/creators/showShortcutHelpDialog.js
@@ -1,5 +1,5 @@
 import ShortcutHelpDialog from '../components/ShortcutHelpDialog.html'
-import { showDialog } from './showDialog'
+import { showDialog } from './showDialog.js'
 
 export default function showShortcutHelpDialog (options) {
   return showDialog(ShortcutHelpDialog, Object.assign({
diff --git a/src/routes/_components/dialog/creators/showStatusOptionsDialog.js b/src/routes/_components/dialog/creators/showStatusOptionsDialog.js
index 342bf108..129e6247 100644
--- a/src/routes/_components/dialog/creators/showStatusOptionsDialog.js
+++ b/src/routes/_components/dialog/creators/showStatusOptionsDialog.js
@@ -1,5 +1,5 @@
 import StatusOptionsDialog from '../components/StatusOptionsDialog.html'
-import { showDialog } from './showDialog'
+import { showDialog } from './showDialog.js'
 
 export default function showStatusOptionsDialog (status) {
   return showDialog(StatusOptionsDialog, {
diff --git a/src/routes/_components/dialog/creators/showTextConfirmationDialog.js b/src/routes/_components/dialog/creators/showTextConfirmationDialog.js
index 3e92d307..00224cc1 100644
--- a/src/routes/_components/dialog/creators/showTextConfirmationDialog.js
+++ b/src/routes/_components/dialog/creators/showTextConfirmationDialog.js
@@ -1,5 +1,5 @@
 import TextConfirmationDialog from '../components/TextConfirmationDialog.html'
-import { showDialog } from './showDialog'
+import { showDialog } from './showDialog.js'
 
 export default function showTextConfirmationDialog (options) {
   return showDialog(TextConfirmationDialog, Object.assign({
diff --git a/src/routes/_components/dialog/creators/showWordFilterDialog.js b/src/routes/_components/dialog/creators/showWordFilterDialog.js
index 17b0cb89..d66a2e97 100644
--- a/src/routes/_components/dialog/creators/showWordFilterDialog.js
+++ b/src/routes/_components/dialog/creators/showWordFilterDialog.js
@@ -1,5 +1,5 @@
 import WordFilterDialog from '../components/WordFilterDialog.html'
-import { showDialog } from './showDialog'
+import { showDialog } from './showDialog.js'
 
 export default function showReportDialog ({ filter, instanceName }) {
   const label = filter ? 'intl.editFilter' : 'intl.addFilter'
diff --git a/src/routes/_components/dialog/helpers/closeDialog.js b/src/routes/_components/dialog/helpers/closeDialog.js
index 9a7056ae..81b986c6 100644
--- a/src/routes/_components/dialog/helpers/closeDialog.js
+++ b/src/routes/_components/dialog/helpers/closeDialog.js
@@ -1,4 +1,4 @@
-import { emit } from '../../../_utils/eventBus'
+import { emit } from '../../../_utils/eventBus.js'
 
 export function close () {
   const { id } = this.get()
diff --git a/src/routes/_components/dialog/helpers/onCreateDialog.js b/src/routes/_components/dialog/helpers/onCreateDialog.js
index e78d1fab..4de0cb5e 100644
--- a/src/routes/_components/dialog/helpers/onCreateDialog.js
+++ b/src/routes/_components/dialog/helpers/onCreateDialog.js
@@ -1,4 +1,4 @@
-import { on } from '../../../_utils/eventBus'
+import { on } from '../../../_utils/eventBus.js'
 
 function onDestroy (thisId) {
   const { id } = this.get()
diff --git a/src/routes/_components/dialog/helpers/showDialog.js b/src/routes/_components/dialog/helpers/showDialog.js
index 133e7c53..9fffb553 100644
--- a/src/routes/_components/dialog/helpers/showDialog.js
+++ b/src/routes/_components/dialog/helpers/showDialog.js
@@ -1,4 +1,4 @@
-import { emit } from '../../../_utils/eventBus'
+import { emit } from '../../../_utils/eventBus.js'
 
 export function show () {
   const { id } = this.get()
diff --git a/src/routes/_components/list/List.html b/src/routes/_components/list/List.html
index 8b43ebbe..b58f1306 100644
--- a/src/routes/_components/list/List.html
+++ b/src/routes/_components/list/List.html
@@ -17,10 +17,10 @@
 </style>
 <script>
   import ListLazyItem from './ListLazyItem.html'
-  import { listStore } from './listStore'
-  import { getScrollContainer } from '../../_utils/scrollContainer'
+  import { listStore } from './listStore.js'
+  import { getScrollContainer } from '../../_utils/scrollContainer.js'
   import { observe } from 'svelte-extras'
-  import { mark, stop } from '../../_utils/marks'
+  import { mark, stop } from '../../_utils/marks.js'
 
   function getScrollTopOffset () {
     return document.getElementById('main-nav').getBoundingClientRect().height
diff --git a/src/routes/_components/list/ListItem.html b/src/routes/_components/list/ListItem.html
index 15db923b..4ba3aead 100644
--- a/src/routes/_components/list/ListItem.html
+++ b/src/routes/_components/list/ListItem.html
@@ -21,7 +21,7 @@
   />
 </div>
 <script>
-  import { doubleRAF } from '../../_utils/doubleRAF'
+  import { doubleRAF } from '../../_utils/doubleRAF.js'
 
   export default {
     oncreate () {
diff --git a/src/routes/_components/list/ListLazyItem.html b/src/routes/_components/list/ListLazyItem.html
index c65c48b5..5d1ae940 100644
--- a/src/routes/_components/list/ListLazyItem.html
+++ b/src/routes/_components/list/ListLazyItem.html
@@ -10,7 +10,7 @@
 {/if}
 <script>
   import ListItem from './ListItem.html'
-  import { mark, stop } from '../../_utils/marks'
+  import { mark, stop } from '../../_utils/marks.js'
 
   export default {
     async oncreate () {
diff --git a/src/routes/_components/list/listStore.js b/src/routes/_components/list/listStore.js
index 6328d7cb..27076cb8 100644
--- a/src/routes/_components/list/listStore.js
+++ b/src/routes/_components/list/listStore.js
@@ -1,5 +1,5 @@
-import { RealmStore } from '../../_utils/RealmStore'
-import { PAGE_HISTORY_SIZE } from '../../_static/pages'
+import { RealmStore } from '../../_utils/RealmStore.js'
+import { PAGE_HISTORY_SIZE } from '../../_static/pages.js'
 
 class ListStore extends RealmStore {
   constructor (state) {
diff --git a/src/routes/_components/profile/AccountDisplayName.html b/src/routes/_components/profile/AccountDisplayName.html
index 3c475707..f90753b3 100644
--- a/src/routes/_components/profile/AccountDisplayName.html
+++ b/src/routes/_components/profile/AccountDisplayName.html
@@ -5,10 +5,10 @@
   }
 </style>
 <script>
-  import { emojifyText } from '../../_utils/emojifyText'
-  import { store } from '../../_store/store'
+  import { emojifyText } from '../../_utils/emojifyText.js'
+  import { store } from '../../_store/store.js'
   import escapeHtml from 'escape-html'
-  import { removeEmoji } from '../../_utils/removeEmoji'
+  import { removeEmoji } from '../../_utils/removeEmoji.js'
 
   export default {
     store: () => store,
diff --git a/src/routes/_components/profile/AccountProfile.html b/src/routes/_components/profile/AccountProfile.html
index 231a067b..19323172 100644
--- a/src/routes/_components/profile/AccountProfile.html
+++ b/src/routes/_components/profile/AccountProfile.html
@@ -114,11 +114,11 @@
   import AccountProfileDetails from './AccountProfileDetails.html'
   import AccountProfileMovedBanner from './AccountProfileMovedBanner.html'
   import AccountProfileFilters from './AccountProfileFilters.html'
-  import { store } from '../../_store/store'
-  import { classname } from '../../_utils/classname'
-  import { scheduleIdleTask } from '../../_utils/scheduleIdleTask'
-  import { addEmojiTooltips } from '../../_utils/addEmojiTooltips'
-  import { formatIntl } from '../../_utils/formatIntl'
+  import { store } from '../../_store/store.js'
+  import { classname } from '../../_utils/classname.js'
+  import { scheduleIdleTask } from '../../_utils/scheduleIdleTask.js'
+  import { addEmojiTooltips } from '../../_utils/addEmojiTooltips.js'
+  import { formatIntl } from '../../_utils/formatIntl.js'
 
   export default {
     oncreate () {
diff --git a/src/routes/_components/profile/AccountProfileDetails.html b/src/routes/_components/profile/AccountProfileDetails.html
index 16af1c37..e5c3718a 100644
--- a/src/routes/_components/profile/AccountProfileDetails.html
+++ b/src/routes/_components/profile/AccountProfileDetails.html
@@ -124,9 +124,9 @@
 <script>
   import IconButton from '../IconButton.html'
   import { importShowAccountProfileOptionsDialog } from '../dialog/asyncDialogs/importShowAccountProfileOptionsDialog.js'
-  import { LOCALE } from '../../_static/intl'
-  import { formatIntl } from '../../_utils/formatIntl'
-  import { thunk } from '../../_utils/thunk'
+  import { LOCALE } from '../../_static/intl.js'
+  import { formatIntl } from '../../_utils/formatIntl.js'
+  import { thunk } from '../../_utils/thunk.js'
 
   const numberFormat = thunk(() => new Intl.NumberFormat(LOCALE))
 
diff --git a/src/routes/_components/profile/AccountProfileFollow.html b/src/routes/_components/profile/AccountProfileFollow.html
index 37251183..dcc49bc9 100644
--- a/src/routes/_components/profile/AccountProfileFollow.html
+++ b/src/routes/_components/profile/AccountProfileFollow.html
@@ -36,11 +36,11 @@
 </style>
 <script>
   import IconButton from '../IconButton.html'
-  import { FOLLOW_BUTTON_ANIMATION } from '../../_static/animations'
-  import { store } from '../../_store/store'
-  import { setAccountFollowed } from '../../_actions/follow'
-  import { setAccountBlocked } from '../../_actions/block'
-  import { formatIntl } from '../../_utils/formatIntl'
+  import { FOLLOW_BUTTON_ANIMATION } from '../../_static/animations.js'
+  import { store } from '../../_store/store.js'
+  import { setAccountFollowed } from '../../_actions/follow.js'
+  import { setAccountBlocked } from '../../_actions/block.js'
+  import { formatIntl } from '../../_utils/formatIntl.js'
 
   export default {
     methods: {
diff --git a/src/routes/_components/profile/AccountProfileHeader.html b/src/routes/_components/profile/AccountProfileHeader.html
index fb23e680..93ab5e88 100644
--- a/src/routes/_components/profile/AccountProfileHeader.html
+++ b/src/routes/_components/profile/AccountProfileHeader.html
@@ -121,12 +121,12 @@
   import Avatar from '../Avatar.html'
   import ExternalLink from '../ExternalLink.html'
   import AccountDisplayName from './AccountDisplayName.html'
-  import { removeEmoji } from '../../_utils/removeEmoji'
-  import { store } from '../../_store/store'
+  import { removeEmoji } from '../../_utils/removeEmoji.js'
+  import { store } from '../../_store/store.js'
   import Label from '../Label.html'
   import { importShowMediaDialog } from '../dialog/asyncDialogs/importShowMediaDialog.js'
-  import { getImageNativeDimensions } from '../../_utils/getImageNativeDimensions'
-  import { formatIntl } from '../../_utils/formatIntl'
+  import { getImageNativeDimensions } from '../../_utils/getImageNativeDimensions.js'
+  import { formatIntl } from '../../_utils/formatIntl.js'
 
   export default {
     store: () => store,
diff --git a/src/routes/_components/profile/AccountProfileMeta.html b/src/routes/_components/profile/AccountProfileMeta.html
index abc264e8..ed7bcfa7 100644
--- a/src/routes/_components/profile/AccountProfileMeta.html
+++ b/src/routes/_components/profile/AccountProfileMeta.html
@@ -101,8 +101,8 @@
 </style>
 <script>
   import SvgIcon from '../SvgIcon.html'
-  import { emojifyText } from '../../_utils/emojifyText'
-  import { store } from '../../_store/store'
+  import { emojifyText } from '../../_utils/emojifyText.js'
+  import { store } from '../../_store/store.js'
 
   export default {
     store: () => store,
diff --git a/src/routes/_components/profile/AccountProfileMovedBanner.html b/src/routes/_components/profile/AccountProfileMovedBanner.html
index b9f87a48..9330ab7e 100644
--- a/src/routes/_components/profile/AccountProfileMovedBanner.html
+++ b/src/routes/_components/profile/AccountProfileMovedBanner.html
@@ -60,10 +60,10 @@
 
 </style>
 <script>
-  import { removeEmoji } from '../../_utils/removeEmoji'
+  import { removeEmoji } from '../../_utils/removeEmoji.js'
   import Avatar from '../Avatar.html'
   import SvgIcon from '../SvgIcon.html'
-  import { formatIntl } from '../../_utils/formatIntl'
+  import { formatIntl } from '../../_utils/formatIntl.js'
 
   export default {
     computed: {
diff --git a/src/routes/_components/profile/AccountProfileNote.html b/src/routes/_components/profile/AccountProfileNote.html
index bc9fdd8d..a8c8f3ba 100644
--- a/src/routes/_components/profile/AccountProfileNote.html
+++ b/src/routes/_components/profile/AccountProfileNote.html
@@ -35,8 +35,8 @@
   }
 </style>
 <script>
-  import { store } from '../../_store/store'
-  import { massageUserText } from '../../_utils/massageUserText'
+  import { store } from '../../_store/store.js'
+  import { massageUserText } from '../../_utils/massageUserText.js'
 
   export default {
     store: () => store,
diff --git a/src/routes/_components/profile/AccountProfilePage.html b/src/routes/_components/profile/AccountProfilePage.html
index af09e22d..ad093958 100644
--- a/src/routes/_components/profile/AccountProfilePage.html
+++ b/src/routes/_components/profile/AccountProfilePage.html
@@ -25,12 +25,12 @@
   import TimelinePage from '../TimelinePage.html'
   import FreeTextLayout from '../FreeTextLayout.html'
   import { store } from '../../_store/store.js'
-  import HiddenFromSSR from '../HiddenFromSSR'
+  import HiddenFromSSR from '../HiddenFromSSR.html'
   import DynamicPageBanner from '../DynamicPageBanner.html'
-  import { updateProfileAndRelationship, clearProfileAndRelationship } from '../../_actions/accounts'
+  import { updateProfileAndRelationship, clearProfileAndRelationship } from '../../_actions/accounts.js'
   import AccountProfile from './AccountProfile.html'
   import PinnedStatuses from '../timeline/PinnedStatuses.html'
-  import { formatIntl } from '../../_utils/formatIntl'
+  import { formatIntl } from '../../_utils/formatIntl.js'
 
   export default {
     oncreate () {
diff --git a/src/routes/_components/radio/RadioGroup.html b/src/routes/_components/radio/RadioGroup.html
index 57199119..9d88d822 100644
--- a/src/routes/_components/radio/RadioGroup.html
+++ b/src/routes/_components/radio/RadioGroup.html
@@ -9,7 +9,7 @@
   <slot></slot>
 </div>
 <script>
-  import { times } from '../../_utils/lodash-lite'
+  import { times } from '../../_utils/lodash-lite.js'
 
   export default {
     methods: {
diff --git a/src/routes/_components/search/Search.html b/src/routes/_components/search/Search.html
index 0b60d993..3c4ad7ff 100644
--- a/src/routes/_components/search/Search.html
+++ b/src/routes/_components/search/Search.html
@@ -57,13 +57,13 @@
   }
 </style>
 <script>
-  import { store } from '../../_store/store'
+  import { store } from '../../_store/store.js'
   import LoadingPage from '../LoadingPage.html'
-  import { doSearch } from '../../_actions/search'
+  import { doSearch } from '../../_actions/search.js'
   import SearchResults from './SearchResults.html'
   import SvgIcon from '../SvgIcon.html'
-  import { on } from '../../_utils/eventBus'
-  import { tryToFocusElement } from '../../_utils/tryToFocusElement'
+  import { on } from '../../_utils/eventBus.js'
+  import { tryToFocusElement } from '../../_utils/tryToFocusElement.js'
 
   export default {
     oncreate () {
diff --git a/src/routes/_components/search/SearchResults.html b/src/routes/_components/search/SearchResults.html
index 3371b842..37aa0f0e 100644
--- a/src/routes/_components/search/SearchResults.html
+++ b/src/routes/_components/search/SearchResults.html
@@ -18,7 +18,7 @@
   }
 </style>
 <script>
-  import { store } from '../../_store/store'
+  import { store } from '../../_store/store.js'
   import AccountSearchResult from './AccountSearchResult.html'
   import HashtagSearchResult from './HashtagSearchResult.html'
   import StatusSearchResult from './StatusSearchResult.html'
@@ -31,4 +31,4 @@
       StatusSearchResult
     }
   }
-</script>
\ No newline at end of file
+</script>
diff --git a/src/routes/_components/settings/SettingsLayout.html b/src/routes/_components/settings/SettingsLayout.html
index f2ba5d86..f5262cbe 100644
--- a/src/routes/_components/settings/SettingsLayout.html
+++ b/src/routes/_components/settings/SettingsLayout.html
@@ -25,7 +25,7 @@
 </style>
 <script>
   import SettingsNav from './SettingsNav.html'
-  import FreeTextLayout from '../FreeTextLayout'
+  import FreeTextLayout from '../FreeTextLayout.html'
   import FocusRestoration from '../FocusRestoration.html'
 
   export default {
diff --git a/src/routes/_components/settings/SettingsNav.html b/src/routes/_components/settings/SettingsNav.html
index 76c50ccf..79ba5d59 100644
--- a/src/routes/_components/settings/SettingsNav.html
+++ b/src/routes/_components/settings/SettingsNav.html
@@ -39,7 +39,7 @@
 </style>
 <script>
   import SettingsNavItem from './SettingsNavItem.html'
-  import { store } from '../../_store/store'
+  import { store } from '../../_store/store.js'
 
   export default {
     components: {
diff --git a/src/routes/_components/settings/SettingsNavItem.html b/src/routes/_components/settings/SettingsNavItem.html
index 326f9b5c..dbafffb0 100644
--- a/src/routes/_components/settings/SettingsNavItem.html
+++ b/src/routes/_components/settings/SettingsNavItem.html
@@ -15,7 +15,7 @@
   }
 </style>
 <script>
-  import { formatIntl } from '../../_utils/formatIntl'
+  import { formatIntl } from '../../_utils/formatIntl.js'
 
   export default {
     computed: {
diff --git a/src/routes/_components/settings/instance/GenericInstanceSettings.html b/src/routes/_components/settings/instance/GenericInstanceSettings.html
index 8aa1095e..0114ba4d 100644
--- a/src/routes/_components/settings/instance/GenericInstanceSettings.html
+++ b/src/routes/_components/settings/instance/GenericInstanceSettings.html
@@ -18,7 +18,7 @@
 <GenericInstanceSettingsStyle/>
 <script>
   import GenericInstanceSettingsStyle from './GenericInstanceSettingsStyle.html'
-  import { store } from '../../../_store/store'
+  import { store } from '../../../_store/store.js'
 
   export default {
     oncreate () {
diff --git a/src/routes/_components/settings/instance/HomeTimelineFilterSettings.html b/src/routes/_components/settings/instance/HomeTimelineFilterSettings.html
index 9fbc9092..fc536d9c 100644
--- a/src/routes/_components/settings/instance/HomeTimelineFilterSettings.html
+++ b/src/routes/_components/settings/instance/HomeTimelineFilterSettings.html
@@ -5,7 +5,7 @@
 />
 <script>
   import GenericInstanceSettings from './GenericInstanceSettings.html'
-  import { HOME_REBLOGS, HOME_REPLIES } from '../../../_static/instanceSettings'
+  import { HOME_REBLOGS, HOME_REPLIES } from '../../../_static/instanceSettings.js'
 
   export default {
     data: () => ({
diff --git a/src/routes/_components/settings/instance/InstanceActions.html b/src/routes/_components/settings/instance/InstanceActions.html
index e1ca7af0..035ea231 100644
--- a/src/routes/_components/settings/instance/InstanceActions.html
+++ b/src/routes/_components/settings/instance/InstanceActions.html
@@ -20,10 +20,10 @@
   }
 </style>
 <script>
-  import { store } from '../../../_store/store'
+  import { store } from '../../../_store/store.js'
   import { importShowTextConfirmationDialog } from '../../dialog/asyncDialogs/importShowTextConfirmationDialog.js'
-  import { switchToInstance, logOutOfInstance } from '../../../_actions/instances'
-  import { formatIntl } from '../../../_utils/formatIntl'
+  import { switchToInstance, logOutOfInstance } from '../../../_actions/instances.js'
+  import { formatIntl } from '../../../_utils/formatIntl.js'
 
   export default {
     store: () => store,
diff --git a/src/routes/_components/settings/instance/NotificationFilterSettings.html b/src/routes/_components/settings/instance/NotificationFilterSettings.html
index a9a50a3c..708b4080 100644
--- a/src/routes/_components/settings/instance/NotificationFilterSettings.html
+++ b/src/routes/_components/settings/instance/NotificationFilterSettings.html
@@ -11,7 +11,7 @@
     NOTIFICATION_FOLLOWS,
     NOTIFICATION_MENTIONS,
     NOTIFICATION_POLLS
-  } from '../../../_static/instanceSettings'
+  } from '../../../_static/instanceSettings.js'
 
   export default {
     data: () => ({
diff --git a/src/routes/_components/settings/instance/PushNotificationSettings.html b/src/routes/_components/settings/instance/PushNotificationSettings.html
index a933d64c..9caa2bd3 100644
--- a/src/routes/_components/settings/instance/PushNotificationSettings.html
+++ b/src/routes/_components/settings/instance/PushNotificationSettings.html
@@ -34,13 +34,13 @@
 </style>
 <script>
   import GenericInstanceSettingsStyle from './GenericInstanceSettingsStyle.html'
-  import { store } from '../../../_store/store'
+  import { store } from '../../../_store/store.js'
   import { importShowTextConfirmationDialog } from '../../dialog/asyncDialogs/importShowTextConfirmationDialog.js'
-  import { logOutOfInstance } from '../../../_actions/instances'
-  import { updatePushSubscriptionForInstance, updateAlerts } from '../../../_actions/pushSubscription'
-  import { toast } from '../../toast/toast'
-  import { get } from '../../../_utils/lodash-lite'
-  import { formatIntl } from '../../../_utils/formatIntl'
+  import { logOutOfInstance } from '../../../_actions/instances.js'
+  import { updatePushSubscriptionForInstance, updateAlerts } from '../../../_actions/pushSubscription.js'
+  import { toast } from '../../toast/toast.js'
+  import { get } from '../../../_utils/lodash-lite.js'
+  import { formatIntl } from '../../../_utils/formatIntl.js'
 
   export default {
     async oncreate () {
diff --git a/src/routes/_components/settings/instance/ThemeSettings.html b/src/routes/_components/settings/instance/ThemeSettings.html
index 9558d7be..39c0f9e4 100644
--- a/src/routes/_components/settings/instance/ThemeSettings.html
+++ b/src/routes/_components/settings/instance/ThemeSettings.html
@@ -83,11 +83,11 @@
 </style>
 <script>
   import GenericInstanceSettingsStyle from './GenericInstanceSettingsStyle.html'
-  import { changeTheme } from '../../../_actions/instances'
-  import { store } from '../../../_store/store'
-  import { themes } from '../../../_static/themes'
-  import { DEFAULT_THEME } from '../../../_utils/themeEngine'
-  import { formatIntl } from '../../../_utils/formatIntl'
+  import { changeTheme } from '../../../_actions/instances.js'
+  import { store } from '../../../_store/store.js'
+  import { themes } from '../../../_static/themes.js'
+  import { DEFAULT_THEME } from '../../../_utils/themeEngine.js'
+  import { formatIntl } from '../../../_utils/formatIntl.js'
 
   export default {
     async oncreate () {
diff --git a/src/routes/_components/settings/instance/WordFilterSettings.html b/src/routes/_components/settings/instance/WordFilterSettings.html
index 3c6aba3d..08360621 100644
--- a/src/routes/_components/settings/instance/WordFilterSettings.html
+++ b/src/routes/_components/settings/instance/WordFilterSettings.html
@@ -53,11 +53,11 @@
 <script>
   import GenericInstanceSettingsStyle from './GenericInstanceSettingsStyle.html'
   import IconButton from '../../IconButton.html'
-  import { store } from '../../../_store/store'
-  import { LOCALE } from '../../../_static/intl'
-  import { importShowWordFilterDialog } from '../../dialog/asyncDialogs/importShowWordFilterDialog'
-  import { deleteFilter } from '../../../_actions/filters'
-  import { thunk } from '../../../_utils/thunk'
+  import { store } from '../../../_store/store.js'
+  import { LOCALE } from '../../../_static/intl.js'
+  import { importShowWordFilterDialog } from '../../dialog/asyncDialogs/importShowWordFilterDialog.js'
+  import { deleteFilter } from '../../../_actions/filters.js'
+  import { thunk } from '../../../_utils/thunk.js'
 
   const listFormat = thunk(() => new Intl.ListFormat(LOCALE, { style: 'long', type: 'conjunction' }))
 
diff --git a/src/routes/_components/shortcut/ScrollListShortcuts.html b/src/routes/_components/shortcut/ScrollListShortcuts.html
index e61fd6f6..ce1b3f19 100644
--- a/src/routes/_components/shortcut/ScrollListShortcuts.html
+++ b/src/routes/_components/shortcut/ScrollListShortcuts.html
@@ -3,16 +3,16 @@
     isVisible,
     firstVisibleElementIndex,
     scrollIntoViewIfNeeded
-} from '../../_utils/scrollIntoView'
+} from '../../_utils/scrollIntoView.js'
   import {
     addShortcutFallback,
     removeShortcutFallback,
     onKeyDownInShortcutScope
-} from '../../_utils/shortcuts'
-  import { smoothScroll } from '../../_utils/smoothScroll'
-  import { getScrollContainer } from '../../_utils/scrollContainer'
-  import { store } from '../../_store/store'
-  import { emit } from '../../_utils/eventBus'
+} from '../../_utils/shortcuts.js'
+  import { smoothScroll } from '../../_utils/smoothScroll.js'
+  import { getScrollContainer } from '../../_utils/scrollContainer.js'
+  import { store } from '../../_store/store.js'
+  import { emit } from '../../_utils/eventBus.js'
 
   const VISIBILITY_CHECK_DELAY_MS = 600
 
diff --git a/src/routes/_components/shortcut/Shortcut.html b/src/routes/_components/shortcut/Shortcut.html
index a267a849..62ac14cd 100644
--- a/src/routes/_components/shortcut/Shortcut.html
+++ b/src/routes/_components/shortcut/Shortcut.html
@@ -2,7 +2,7 @@
   import {
     addToShortcutScope,
     removeFromShortcutScope
-} from '../../_utils/shortcuts'
+} from '../../_utils/shortcuts.js'
   export default {
     data: () => ({ scope: 'global', key: null }),
     oncreate () {
diff --git a/src/routes/_components/snackbar/Snackbar.html b/src/routes/_components/snackbar/Snackbar.html
index 7cbef057..fb8ca44c 100644
--- a/src/routes/_components/snackbar/Snackbar.html
+++ b/src/routes/_components/snackbar/Snackbar.html
@@ -122,7 +122,7 @@
   }
 </style>
 <script>
-  import { doubleRAF } from '../../_utils/doubleRAF'
+  import { doubleRAF } from '../../_utils/doubleRAF.js'
   import SvgIcon from '../SvgIcon.html'
 
   export default {
diff --git a/src/routes/_components/status/Media.html b/src/routes/_components/status/Media.html
index e85eca31..212a1cdc 100644
--- a/src/routes/_components/status/Media.html
+++ b/src/routes/_components/status/Media.html
@@ -101,17 +101,17 @@
   }
 </style>
 <script>
-  import { DEFAULT_MEDIA_WIDTH, DEFAULT_MEDIA_HEIGHT, ONE_TRANSPARENT_PIXEL } from '../../_static/media'
+  import { DEFAULT_MEDIA_WIDTH, DEFAULT_MEDIA_HEIGHT, ONE_TRANSPARENT_PIXEL } from '../../_static/media.js'
   import { importShowMediaDialog } from '../dialog/asyncDialogs/importShowMediaDialog.js'
-  import { mouseover } from '../../_utils/events'
+  import { mouseover } from '../../_utils/events.js'
   import NonAutoplayGifv from '../NonAutoplayGifv.html'
   import PlayVideoIcon from '../PlayVideoIcon.html'
-  import { store } from '../../_store/store'
+  import { store } from '../../_store/store.js'
   import LazyImage from '../LazyImage.html'
   import AutoplayVideo from '../AutoplayVideo.html'
-  import { registerClickDelegate } from '../../_utils/delegate'
-  import { convertCssPropertyToDataUrl } from '../../_utils/convertCssPropertyToDataUrl'
-  import { formatIntl } from '../../_utils/formatIntl'
+  import { registerClickDelegate } from '../../_utils/delegate.js'
+  import { convertCssPropertyToDataUrl } from '../../_utils/convertCssPropertyToDataUrl.js'
+  import { formatIntl } from '../../_utils/formatIntl.js'
 
 export default {
     async oncreate () {
diff --git a/src/routes/_components/status/MediaAttachments.html b/src/routes/_components/status/MediaAttachments.html
index 277e2e37..b5d7e0c5 100644
--- a/src/routes/_components/status/MediaAttachments.html
+++ b/src/routes/_components/status/MediaAttachments.html
@@ -56,7 +56,7 @@
 </style>
 <script>
   import Media from './Media.html'
-  import { classname } from '../../_utils/classname'
+  import { classname } from '../../_utils/classname.js'
 
   export default {
     computed: {
diff --git a/src/routes/_components/status/Notification.html b/src/routes/_components/status/Notification.html
index a50fa14d..10ee30d2 100644
--- a/src/routes/_components/status/Notification.html
+++ b/src/routes/_components/status/Notification.html
@@ -36,13 +36,13 @@
   import Status from './Status.html'
   import StatusHeader from './StatusHeader.html'
   import Shortcut from '../shortcut/Shortcut.html'
-  import { store } from '../../_store/store'
-  import { getAccountAccessibleName } from '../../_a11y/getAccountAccessibleName'
-  import { goto } from '../../../../__sapper__/client'
-  import { composeNewStatusMentioning } from '../../_actions/mention'
-  import { classname } from '../../_utils/classname'
-  import { createStatusOrNotificationUuid } from '../../_utils/createStatusOrNotificationUuid'
-  import { formatIntl } from '../../_utils/formatIntl'
+  import { store } from '../../_store/store.js'
+  import { getAccountAccessibleName } from '../../_a11y/getAccountAccessibleName.js'
+  import { goto } from '../../../../__sapper__/client.js'
+  import { composeNewStatusMentioning } from '../../_actions/mention.js'
+  import { classname } from '../../_utils/classname.js'
+  import { createStatusOrNotificationUuid } from '../../_utils/createStatusOrNotificationUuid.js'
+  import { formatIntl } from '../../_utils/formatIntl.js'
 
   export default {
     components: {
diff --git a/src/routes/_components/status/Status.html b/src/routes/_components/status/Status.html
index 0ee386ec..870703f5 100644
--- a/src/routes/_components/status/Status.html
+++ b/src/routes/_components/status/Status.html
@@ -116,21 +116,21 @@
   import StatusMentions from './StatusMentions.html'
   import StatusPoll from './StatusPoll.html'
   import Shortcut from '../shortcut/Shortcut.html'
-  import { store } from '../../_store/store'
-  import { goto } from '../../../../__sapper__/client'
-  import { registerClickDelegate } from '../../_utils/delegate'
-  import { classname } from '../../_utils/classname'
-  import { checkDomAncestors } from '../../_utils/checkDomAncestors'
-  import { scheduleIdleTask } from '../../_utils/scheduleIdleTask'
-  import { getAccountAccessibleName } from '../../_a11y/getAccountAccessibleName'
-  import { getAccessibleLabelForStatus } from '../../_a11y/getAccessibleLabelForStatus'
-  import { formatTimeagoDate } from '../../_intl/formatTimeagoDate'
-  import { measureText } from '../../_utils/measureText'
-  import { LONG_POST_LENGTH, LONG_POST_TEXT } from '../../_static/statuses'
-  import { absoluteDateFormatter, dayOnlyAbsoluteDateFormatter } from '../../_utils/formatters'
-  import { composeNewStatusMentioning } from '../../_actions/mention'
-  import { createStatusOrNotificationUuid } from '../../_utils/createStatusOrNotificationUuid'
-  import { addEmojiTooltips } from '../../_utils/addEmojiTooltips'
+  import { store } from '../../_store/store.js'
+  import { goto } from '../../../../__sapper__/client.js'
+  import { registerClickDelegate } from '../../_utils/delegate.js'
+  import { classname } from '../../_utils/classname.js'
+  import { checkDomAncestors } from '../../_utils/checkDomAncestors.js'
+  import { scheduleIdleTask } from '../../_utils/scheduleIdleTask.js'
+  import { getAccountAccessibleName } from '../../_a11y/getAccountAccessibleName.js'
+  import { getAccessibleLabelForStatus } from '../../_a11y/getAccessibleLabelForStatus.js'
+  import { formatTimeagoDate } from '../../_intl/formatTimeagoDate.js'
+  import { measureText } from '../../_utils/measureText.js'
+  import { LONG_POST_LENGTH, LONG_POST_TEXT } from '../../_static/statuses.js'
+  import { absoluteDateFormatter, dayOnlyAbsoluteDateFormatter } from '../../_utils/formatters.js'
+  import { composeNewStatusMentioning } from '../../_actions/mention.js'
+  import { createStatusOrNotificationUuid } from '../../_utils/createStatusOrNotificationUuid.js'
+  import { addEmojiTooltips } from '../../_utils/addEmojiTooltips.js'
 
   const INPUT_TAGS = new Set(['a', 'button', 'input', 'textarea', 'label'])
   const isUserInputElement = node => INPUT_TAGS.has(node.localName)
diff --git a/src/routes/_components/status/StatusCard.html b/src/routes/_components/status/StatusCard.html
index 29938b03..8ecac1ac 100644
--- a/src/routes/_components/status/StatusCard.html
+++ b/src/routes/_components/status/StatusCard.html
@@ -87,7 +87,7 @@
 <script>
   import LazyImage from '../LazyImage.html'
   import Shortcut from '../shortcut/Shortcut.html'
-  import { unescape } from '../../_thirdparty/unescape/unescape'
+  import { unescape } from '../../_thirdparty/unescape/unescape.js'
 
   export default {
     components: {
diff --git a/src/routes/_components/status/StatusComposeBox.html b/src/routes/_components/status/StatusComposeBox.html
index 5c7b8560..fec19b2f 100644
--- a/src/routes/_components/status/StatusComposeBox.html
+++ b/src/routes/_components/status/StatusComposeBox.html
@@ -16,10 +16,9 @@
 </style>
 <script>
   import ComposeBox from '../compose/ComposeBox.html'
-  import { store } from '../../_store/store'
-  import debounce from 'lodash-es/debounce'
-  import throttle from 'lodash-es/throttle'
-  import { on } from '../../_utils/eventBus'
+  import { store } from '../../_store/store.js'
+  import { debounce, throttle } from '../../_thirdparty/lodash/timers.js'
+  import { on } from '../../_utils/eventBus.js'
   import { observe } from 'svelte-extras'
 
   const DEBOUNCE_DELAY = 400
diff --git a/src/routes/_components/status/StatusContent.html b/src/routes/_components/status/StatusContent.html
index a48596ad..87e92d34 100644
--- a/src/routes/_components/status/StatusContent.html
+++ b/src/routes/_components/status/StatusContent.html
@@ -93,11 +93,11 @@
 
 </style>
 <script>
-  import { mark, stop } from '../../_utils/marks'
-  import { store } from '../../_store/store'
-  import { classname } from '../../_utils/classname'
-  import { massageUserText } from '../../_utils/massageUserText'
-  import { urlIsCrossOrigin } from '../../_utils/urlIsCrossOrigin'
+  import { mark, stop } from '../../_utils/marks.js'
+  import { store } from '../../_store/store.js'
+  import { classname } from '../../_utils/classname.js'
+  import { massageUserText } from '../../_utils/massageUserText.js'
+  import { urlIsCrossOrigin } from '../../_utils/urlIsCrossOrigin.js'
 
   export default {
     oncreate () {
diff --git a/src/routes/_components/status/StatusDetails.html b/src/routes/_components/status/StatusDetails.html
index 7a613495..ab709ffb 100644
--- a/src/routes/_components/status/StatusDetails.html
+++ b/src/routes/_components/status/StatusDetails.html
@@ -131,11 +131,11 @@
 </style>
 <script>
   import ExternalLink from '../ExternalLink.html'
-  import { store } from '../../_store/store'
-  import { absoluteDateFormatter, shortAbsoluteDateFormatter } from '../../_utils/formatters'
+  import { store } from '../../_store/store.js'
+  import { absoluteDateFormatter, shortAbsoluteDateFormatter } from '../../_utils/formatters.js'
   import SvgIcon from '../SvgIcon.html'
-  import { on } from '../../_utils/eventBus'
-  import { formatIntl } from '../../_utils/formatIntl'
+  import { on } from '../../_utils/eventBus.js'
+  import { formatIntl } from '../../_utils/formatIntl.js'
 
   export default {
     oncreate () {
diff --git a/src/routes/_components/status/StatusHeader.html b/src/routes/_components/status/StatusHeader.html
index 82531256..908dc5f8 100644
--- a/src/routes/_components/status/StatusHeader.html
+++ b/src/routes/_components/status/StatusHeader.html
@@ -104,7 +104,7 @@
   import Avatar from '../Avatar.html'
   import AccountDisplayName from '../profile/AccountDisplayName.html'
   import SvgIcon from '../SvgIcon.html'
-  import { store } from '../../_store/store'
+  import { store } from '../../_store/store.js'
 
   export default {
     components: {
diff --git a/src/routes/_components/status/StatusMediaAttachments.html b/src/routes/_components/status/StatusMediaAttachments.html
index 77b5720b..941e7ebd 100644
--- a/src/routes/_components/status/StatusMediaAttachments.html
+++ b/src/routes/_components/status/StatusMediaAttachments.html
@@ -167,10 +167,10 @@
   import MediaAttachments from './MediaAttachments.html'
   import Shortcut from '../shortcut/Shortcut.html'
   import SvgIcon from '../SvgIcon.html'
-  import { store } from '../../_store/store'
-  import { registerClickDelegate } from '../../_utils/delegate'
-  import { classname } from '../../_utils/classname'
-  import { importShowMediaDialog } from '../dialog/asyncDialogs/importShowMediaDialog'
+  import { store } from '../../_store/store.js'
+  import { registerClickDelegate } from '../../_utils/delegate.js'
+  import { classname } from '../../_utils/classname.js'
+  import { importShowMediaDialog } from '../dialog/asyncDialogs/importShowMediaDialog.js'
 
   export default {
     oncreate () {
diff --git a/src/routes/_components/status/StatusPoll.html b/src/routes/_components/status/StatusPoll.html
index b00fdd4a..df5fb9f3 100644
--- a/src/routes/_components/status/StatusPoll.html
+++ b/src/routes/_components/status/StatusPoll.html
@@ -244,15 +244,15 @@
 </style>
 <script>
   import SvgIcon from '../SvgIcon.html'
-  import { store } from '../../_store/store'
-  import { formatTimeagoFutureDate, formatTimeagoDate } from '../../_intl/formatTimeagoDate'
-  import { absoluteDateFormatter } from '../../_utils/formatters'
-  import { registerClickDelegate } from '../../_utils/delegate'
-  import { classname } from '../../_utils/classname'
-  import { getPoll, voteOnPoll } from '../../_actions/polls'
+  import { store } from '../../_store/store.js'
+  import { formatTimeagoFutureDate, formatTimeagoDate } from '../../_intl/formatTimeagoDate.js'
+  import { absoluteDateFormatter } from '../../_utils/formatters.js'
+  import { registerClickDelegate } from '../../_utils/delegate.js'
+  import { classname } from '../../_utils/classname.js'
+  import { getPoll, voteOnPoll } from '../../_actions/polls.js'
   import escapeHtml from 'escape-html'
-  import { emojifyText } from '../../_utils/emojifyText'
-  import { formatIntl } from '../../_utils/formatIntl'
+  import { emojifyText } from '../../_utils/emojifyText.js'
+  import { formatIntl } from '../../_utils/formatIntl.js'
 
   const REFRESH_MIN_DELAY = 1000
 
diff --git a/src/routes/_components/status/StatusRelativeDate.html b/src/routes/_components/status/StatusRelativeDate.html
index ad2ffde6..558ed357 100644
--- a/src/routes/_components/status/StatusRelativeDate.html
+++ b/src/routes/_components/status/StatusRelativeDate.html
@@ -31,7 +31,7 @@
 
 </style>
 <script>
-  import { formatIntl } from '../../_utils/formatIntl'
+  import { formatIntl } from '../../_utils/formatIntl.js'
 
   export default {
     computed: {
diff --git a/src/routes/_components/status/StatusSpoiler.html b/src/routes/_components/status/StatusSpoiler.html
index 203dcf39..06af8af0 100644
--- a/src/routes/_components/status/StatusSpoiler.html
+++ b/src/routes/_components/status/StatusSpoiler.html
@@ -48,11 +48,11 @@
 </style>
 <script>
   import Shortcut from '../shortcut/Shortcut.html'
-  import { store } from '../../_store/store'
-  import { registerClickDelegate } from '../../_utils/delegate'
-  import { mark, stop } from '../../_utils/marks'
-  import { emojifyText } from '../../_utils/emojifyText'
-  import { on } from '../../_utils/eventBus'
+  import { store } from '../../_store/store.js'
+  import { registerClickDelegate } from '../../_utils/delegate.js'
+  import { mark, stop } from '../../_utils/marks.js'
+  import { emojifyText } from '../../_utils/emojifyText.js'
+  import { on } from '../../_utils/eventBus.js'
   import escapeHtml from 'escape-html'
 
   export default {
diff --git a/src/routes/_components/status/StatusToolbar.html b/src/routes/_components/status/StatusToolbar.html
index 74bb5766..48d20141 100644
--- a/src/routes/_components/status/StatusToolbar.html
+++ b/src/routes/_components/status/StatusToolbar.html
@@ -69,14 +69,14 @@
 <script>
   import IconButton from '../IconButton.html'
   import Shortcut from '../shortcut/Shortcut.html'
-  import { store } from '../../_store/store'
-  import { registerClickDelegates } from '../../_utils/delegate'
-  import { setFavorited } from '../../_actions/favorite'
-  import { setReblogged } from '../../_actions/reblog'
+  import { store } from '../../_store/store.js'
+  import { registerClickDelegates } from '../../_utils/delegate.js'
+  import { setFavorited } from '../../_actions/favorite.js'
+  import { setReblogged } from '../../_actions/reblog.js'
   import { importShowStatusOptionsDialog } from '../dialog/asyncDialogs/importShowStatusOptionsDialog.js'
-  import { updateProfileAndRelationship } from '../../_actions/accounts'
-  import { FAVORITE_ANIMATION, REBLOG_ANIMATION } from '../../_static/animations'
-  import { on } from '../../_utils/eventBus'
+  import { updateProfileAndRelationship } from '../../_actions/accounts.js'
+  import { FAVORITE_ANIMATION, REBLOG_ANIMATION } from '../../_static/animations.js'
+  import { on } from '../../_utils/eventBus.js'
 
   export default {
     oncreate () {
diff --git a/src/routes/_components/timeline/LazyTimeline.html b/src/routes/_components/timeline/LazyTimeline.html
index 71874775..3fe88309 100644
--- a/src/routes/_components/timeline/LazyTimeline.html
+++ b/src/routes/_components/timeline/LazyTimeline.html
@@ -9,9 +9,9 @@
   }
 </style>
 <script>
-  import { store } from '../../_store/store'
-  import { importLoggedInStoreExtensions } from '../../_utils/asyncModules/importLoggedInStoreExtensions'
-  import { importTimeline } from '../../_utils/asyncModules/importTimeline'
+  import { store } from '../../_store/store.js'
+  import { importLoggedInStoreExtensions } from '../../_utils/asyncModules/importLoggedInStoreExtensions.js'
+  import { importTimeline } from '../../_utils/asyncModules/importTimeline.js'
 
   export default {
     async oncreate () {
diff --git a/src/routes/_components/timeline/LoadingFooter.html b/src/routes/_components/timeline/LoadingFooter.html
index c527325e..361cefed 100644
--- a/src/routes/_components/timeline/LoadingFooter.html
+++ b/src/routes/_components/timeline/LoadingFooter.html
@@ -64,8 +64,8 @@
 </style>
 <script>
   import LoadingSpinner from '../LoadingSpinner.html'
-  import { store } from '../../_store/store'
-  import { fetchMoreItemsAtBottomOfTimeline } from '../../_actions/timeline'
+  import { store } from '../../_store/store.js'
+  import { fetchMoreItemsAtBottomOfTimeline } from '../../_actions/timeline.js'
 
   export default {
     store: () => store,
diff --git a/src/routes/_components/timeline/MoreHeader.html b/src/routes/_components/timeline/MoreHeader.html
index 4b45e42e..bff0ae0a 100644
--- a/src/routes/_components/timeline/MoreHeader.html
+++ b/src/routes/_components/timeline/MoreHeader.html
@@ -12,7 +12,7 @@
   }
 </style>
 <script>
-  import { formatIntl } from '../../_utils/formatIntl'
+  import { formatIntl } from '../../_utils/formatIntl.js'
 
   export default {
     methods: {
diff --git a/src/routes/_components/timeline/PinnedStatuses.html b/src/routes/_components/timeline/PinnedStatuses.html
index b4e1ddbb..2784bfe2 100644
--- a/src/routes/_components/timeline/PinnedStatuses.html
+++ b/src/routes/_components/timeline/PinnedStatuses.html
@@ -21,10 +21,10 @@
   }
 </style>
 <script>
-  import { store } from '../../_store/store'
+  import { store } from '../../_store/store.js'
   import Status from '../status/Status.html'
-  import { updatePinnedStatusesForAccount } from '../../_actions/pinnedStatuses'
-  import { on } from '../../_utils/eventBus'
+  import { updatePinnedStatusesForAccount } from '../../_actions/pinnedStatuses.js'
+  import { on } from '../../_utils/eventBus.js'
 
   export default {
     async oncreate () {
diff --git a/src/routes/_components/timeline/Timeline.html b/src/routes/_components/timeline/Timeline.html
index 417b93e9..6cf1bf84 100644
--- a/src/routes/_components/timeline/Timeline.html
+++ b/src/routes/_components/timeline/Timeline.html
@@ -25,31 +25,31 @@
 <Shortcut scope="global" key="." on:pressed="showMoreAndScrollToTop()" />
 <ScrollListShortcuts />
 <script>
-  import { store } from '../../_store/store'
+  import { store } from '../../_store/store.js'
   import Status from '../status/Status.html'
   import LoadingFooter from './LoadingFooter.html'
   import MoreHeaderVirtualWrapper from './MoreHeaderVirtualWrapper.html'
   import ScrollListShortcuts from '../shortcut/ScrollListShortcuts.html'
   import Shortcut from '../shortcut/Shortcut.html'
-  import { importVirtualList } from '../../_utils/asyncModules/importVirtualList'
-  import { importList } from '../../_utils/asyncModules/importList'
-  import { importStatusVirtualListItem } from '../../_utils/asyncModules/importStatusVirtualListItem'
-  import { importNotificationVirtualListItem } from '../../_utils/asyncModules/importNotificationVirtualListItem'
-  import { timelines } from '../../_static/timelines'
+  import { importVirtualList } from '../../_utils/asyncModules/importVirtualList.js'
+  import { importList } from '../../_utils/asyncModules/importList.js'
+  import { importStatusVirtualListItem } from '../../_utils/asyncModules/importStatusVirtualListItem.js'
+  import { importNotificationVirtualListItem } from '../../_utils/asyncModules/importNotificationVirtualListItem.js'
+  import { timelines } from '../../_static/timelines.js'
   import {
     fetchMoreItemsAtBottomOfTimeline,
     setupTimeline,
     showMoreItemsForTimeline,
     showMoreItemsForThread,
     showMoreItemsForCurrentTimeline
-  } from '../../_actions/timeline'
-  import { scheduleIdleTask } from '../../_utils/scheduleIdleTask'
-  import { mark, stop } from '../../_utils/marks'
-  import isEqual from 'lodash-es/isEqual'
-  import { doubleRAF } from '../../_utils/doubleRAF'
+  } from '../../_actions/timeline.js'
+  import { scheduleIdleTask } from '../../_utils/scheduleIdleTask.js'
+  import { mark, stop } from '../../_utils/marks.js'
+  import { isEqual } from '../../_thirdparty/lodash/objects.js'
+  import { doubleRAF } from '../../_utils/doubleRAF.js'
   import { observe } from 'svelte-extras'
-  import { createMakeProps } from '../../_actions/createMakeProps'
-  import { showMoreAndScrollToTop } from '../../_actions/showMoreAndScrollToTop'
+  import { createMakeProps } from '../../_actions/createMakeProps.js'
+  import { showMoreAndScrollToTop } from '../../_actions/showMoreAndScrollToTop.js'
   import FocusRestoration from '../FocusRestoration.html'
 
   export default {
diff --git a/src/routes/_components/virtualList/VirtualList.html b/src/routes/_components/virtualList/VirtualList.html
index 62a92952..c3a904b4 100644
--- a/src/routes/_components/virtualList/VirtualList.html
+++ b/src/routes/_components/virtualList/VirtualList.html
@@ -37,13 +37,13 @@
 </style>
 <script>
   import VirtualListContainer from './VirtualListContainer.html'
-  import VirtualListLazyItem from './VirtualListLazyItem'
+  import VirtualListLazyItem from './VirtualListLazyItem.html'
   import VirtualListFooter from './VirtualListFooter.html'
   import VirtualListHeader from './VirtualListHeader.html'
-  import { virtualListStore } from './virtualListStore'
-  import throttle from 'lodash-es/throttle'
-  import { mark, stop } from '../../_utils/marks'
-  import isEqual from 'lodash-es/isEqual'
+  import { virtualListStore } from './virtualListStore.js'
+  import { isEqual } from '../../_thirdparty/lodash/objects.js'
+  import { throttle } from '../../_thirdparty/lodash/timers.js'
+  import { mark, stop } from '../../_utils/marks.js'
   import { observe } from 'svelte-extras'
 
   const DISTANCE_FROM_BOTTOM_TO_FIRE = 800
diff --git a/src/routes/_components/virtualList/VirtualListContainer.html b/src/routes/_components/virtualList/VirtualListContainer.html
index e4521702..72542fea 100644
--- a/src/routes/_components/virtualList/VirtualListContainer.html
+++ b/src/routes/_components/virtualList/VirtualListContainer.html
@@ -1,18 +1,18 @@
 <slot></slot>
 <script>
-  import { virtualListStore } from './virtualListStore'
-  import throttle from 'lodash-es/throttle'
-  import { isFullscreen, attachFullscreenListener, detachFullscreenListener } from '../../_utils/fullscreen'
-  import { mark, stop } from '../../_utils/marks'
-  import { doubleRAF } from '../../_utils/doubleRAF'
+  import { virtualListStore } from './virtualListStore.js'
+  import { throttle } from '../../_thirdparty/lodash/timers.js'
+  import { isFullscreen, attachFullscreenListener, detachFullscreenListener } from '../../_utils/fullscreen.js'
+  import { mark, stop } from '../../_utils/marks.js'
+  import { doubleRAF } from '../../_utils/doubleRAF.js'
   import { observe } from 'svelte-extras'
   import {
     addScrollListener,
     removeScrollListener,
     getScrollContainer,
     getOffsetHeight
-  } from '../../_utils/scrollContainer'
-  import { registerResizeListener, unregisterResizeListener } from '../../_utils/resize'
+  } from '../../_utils/scrollContainer.js'
+  import { registerResizeListener, unregisterResizeListener } from '../../_utils/resize.js'
 
   const SCROLL_EVENT_DELAY = 300
 
diff --git a/src/routes/_components/virtualList/VirtualListFooter.html b/src/routes/_components/virtualList/VirtualListFooter.html
index 13c46178..60a5ff79 100644
--- a/src/routes/_components/virtualList/VirtualListFooter.html
+++ b/src/routes/_components/virtualList/VirtualListFooter.html
@@ -11,8 +11,8 @@
   }
 </style>
 <script>
-  import { virtualListStore } from './virtualListStore'
-  import { mark, stop } from '../../_utils/marks'
+  import { virtualListStore } from './virtualListStore.js'
+  import { mark, stop } from '../../_utils/marks.js'
 
   export default {
     oncreate () {
@@ -30,4 +30,4 @@
     },
     store: () => virtualListStore
   }
-</script>
\ No newline at end of file
+</script>
diff --git a/src/routes/_components/virtualList/VirtualListHeader.html b/src/routes/_components/virtualList/VirtualListHeader.html
index 993c7891..b653e030 100644
--- a/src/routes/_components/virtualList/VirtualListHeader.html
+++ b/src/routes/_components/virtualList/VirtualListHeader.html
@@ -21,9 +21,9 @@
   }
 </style>
 <script>
-  import { virtualListStore } from './virtualListStore'
-  import { doubleRAF } from '../../_utils/doubleRAF'
-  import { mark, stop } from '../../_utils/marks'
+  import { virtualListStore } from './virtualListStore.js'
+  import { doubleRAF } from '../../_utils/doubleRAF.js'
+  import { mark, stop } from '../../_utils/marks.js'
   import { observe } from 'svelte-extras'
 
   export default {
diff --git a/src/routes/_components/virtualList/VirtualListItem.html b/src/routes/_components/virtualList/VirtualListItem.html
index 4ca0a756..34e19b16 100644
--- a/src/routes/_components/virtualList/VirtualListItem.html
+++ b/src/routes/_components/virtualList/VirtualListItem.html
@@ -24,12 +24,12 @@
   }
 </style>
 <script>
-  import { virtualListStore } from './virtualListStore'
-  import { registerResizeListener, unregisterResizeListener } from '../../_utils/resize'
-  import { mark, stop } from '../../_utils/marks'
-  import { requestPostAnimationFrame } from '../../_utils/requestPostAnimationFrame'
+  import { virtualListStore } from './virtualListStore.js'
+  import { registerResizeListener, unregisterResizeListener } from '../../_utils/resize.js'
+  import { mark, stop } from '../../_utils/marks.js'
+  import { requestPostAnimationFrame } from '../../_utils/requestPostAnimationFrame.js'
   import { observe } from 'svelte-extras'
-  import { doubleRAF } from '../../_utils/doubleRAF'
+  import { doubleRAF } from '../../_utils/doubleRAF.js'
 
   export default {
     oncreate () {
diff --git a/src/routes/_components/virtualList/VirtualListLazyItem.html b/src/routes/_components/virtualList/VirtualListLazyItem.html
index 3fa46322..ace2cdc9 100644
--- a/src/routes/_components/virtualList/VirtualListLazyItem.html
+++ b/src/routes/_components/virtualList/VirtualListLazyItem.html
@@ -7,12 +7,12 @@
   />
 {/if}
 <script>
-  import VirtualListItem from './VirtualListItem'
-  import { mark, stop } from '../../_utils/marks'
-  import { scheduleIdleTask } from '../../_utils/scheduleIdleTask'
-  import { createPriorityQueue } from '../../_utils/createPriorityQueue'
-  import { isMobile } from '../../_utils/userAgent/isMobile'
-  import { store } from '../../_store/store'
+  import VirtualListItem from './VirtualListItem.html'
+  import { mark, stop } from '../../_utils/marks.js'
+  import { scheduleIdleTask } from '../../_utils/scheduleIdleTask.js'
+  import { createPriorityQueue } from '../../_utils/createPriorityQueue.js'
+  import { isMobile } from '../../_utils/userAgent/isMobile.js'
+  import { store } from '../../_store/store.js'
 
   // In Svelte's implementation of lists, these VirtualListLazyItems can be
   // created in any order. By default in fact it seems to do it in reverse
diff --git a/src/routes/_components/virtualList/virtualListStore.js b/src/routes/_components/virtualList/virtualListStore.js
index 98e647c9..9b7dbafa 100644
--- a/src/routes/_components/virtualList/virtualListStore.js
+++ b/src/routes/_components/virtualList/virtualListStore.js
@@ -1,6 +1,6 @@
-import { mark, stop } from '../../_utils/marks'
-import { RealmStore } from '../../_utils/RealmStore'
-import { reselect } from '../../_utils/reselect'
+import { mark, stop } from '../../_utils/marks.js'
+import { RealmStore } from '../../_utils/RealmStore.js'
+import { reselect } from '../../_utils/reselect.js'
 
 const RENDER_BUFFER_FACTOR = 2.5
 
diff --git a/src/routes/_database/accounts.js b/src/routes/_database/accounts.js
index c87d5c24..d728b37d 100644
--- a/src/routes/_database/accounts.js
+++ b/src/routes/_database/accounts.js
@@ -1,8 +1,8 @@
-import { ACCOUNTS_STORE, USERNAME_LOWERCASE } from './constants'
-import { accountsCache } from './cache'
-import { cloneForStorage, getGenericEntityWithId, setGenericEntityWithId } from './helpers'
-import { dbPromise, getDatabase } from './databaseLifecycle'
-import { createAccountUsernamePrefixKeyRange } from './keys'
+import { ACCOUNTS_STORE, USERNAME_LOWERCASE } from './constants.js'
+import { accountsCache } from './cache.js'
+import { cloneForStorage, getGenericEntityWithId, setGenericEntityWithId } from './helpers.js'
+import { dbPromise, getDatabase } from './databaseLifecycle.js'
+import { createAccountUsernamePrefixKeyRange } from './keys.js'
 
 export async function getAccount (instanceName, accountId) {
   return getGenericEntityWithId(ACCOUNTS_STORE, accountsCache, instanceName, accountId)
diff --git a/src/routes/_database/cache.js b/src/routes/_database/cache.js
index 7f03a377..9aeba844 100644
--- a/src/routes/_database/cache.js
+++ b/src/routes/_database/cache.js
@@ -1,4 +1,4 @@
-import { QuickLRU } from '../_thirdparty/quick-lru/quick-lru'
+import { QuickLRU } from '../_thirdparty/quick-lru/quick-lru.js'
 
 export const statusesCache = {
   maxSize: 100,
diff --git a/src/routes/_database/cleanup.js b/src/routes/_database/cleanup.js
index cc5a8fac..f35432b4 100644
--- a/src/routes/_database/cleanup.js
+++ b/src/routes/_database/cleanup.js
@@ -1,4 +1,4 @@
-import { dbPromise, getDatabase } from './databaseLifecycle'
+import { dbPromise, getDatabase } from './databaseLifecycle.js'
 import {
   ACCOUNTS_STORE,
   NOTIFICATION_TIMELINES_STORE,
@@ -9,15 +9,15 @@ import {
   STATUSES_STORE,
   THREADS_STORE,
   TIMESTAMP
-} from './constants'
-import debounce from 'lodash-es/debounce'
-import { mark, stop } from '../_utils/marks'
-import { deleteAll } from './utils'
-import { createPinnedStatusKeyRange, createThreadKeyRange } from './keys'
-import { getKnownInstances } from './knownInstances'
-import noop from 'lodash-es/noop'
-import { CLEANUP_DELAY, CLEANUP_TIME_AGO } from '../_static/database'
-import { scheduleIdleTask } from '../_utils/scheduleIdleTask'
+} from './constants.js'
+import { debounce } from '../_thirdparty/lodash/timers.js'
+import { mark, stop } from '../_utils/marks.js'
+import { deleteAll } from './utils.js'
+import { createPinnedStatusKeyRange, createThreadKeyRange } from './keys.js'
+import { getKnownInstances } from './knownInstances.js'
+import { noop } from '../_utils/lodash-lite.js'
+import { CLEANUP_DELAY, CLEANUP_TIME_AGO } from '../_static/database.js'
+import { scheduleIdleTask } from '../_utils/scheduleIdleTask.js'
 
 const BATCH_SIZE = 20
 
diff --git a/src/routes/_database/clear.js b/src/routes/_database/clear.js
index 9078d972..156a324b 100644
--- a/src/routes/_database/clear.js
+++ b/src/routes/_database/clear.js
@@ -1,5 +1,5 @@
-import { accountsCache, clearCache, metaCache, statusesCache } from './cache'
-import { deleteDatabase } from './databaseLifecycle'
+import { accountsCache, clearCache, metaCache, statusesCache } from './cache.js'
+import { deleteDatabase } from './databaseLifecycle.js'
 
 export async function clearDatabaseForInstance (instanceName) {
   clearCache(statusesCache, instanceName)
diff --git a/src/routes/_database/database.js b/src/routes/_database/database.js
index 9a8eefc3..a4f10c52 100644
--- a/src/routes/_database/database.js
+++ b/src/routes/_database/database.js
@@ -1,5 +1,2 @@
-// The proxy stuff doesn't play well with IDEs, so use this as
-// the dev mode database.js, but swap out the other one in Webpack.
-
-import * as database from './databaseApis'
-export { database }
+import { asyncDatabase } from './asyncDatabase.js'
+export { asyncDatabase as database }
diff --git a/src/routes/_database/database.prod.js b/src/routes/_database/database.prod.js
deleted file mode 100644
index de1569a9..00000000
--- a/src/routes/_database/database.prod.js
+++ /dev/null
@@ -1,2 +0,0 @@
-import { asyncDatabase } from './asyncDatabase'
-export { asyncDatabase as database }
diff --git a/src/routes/_database/databaseApis.js b/src/routes/_database/databaseApis.js
index dcd6c30f..afc73e75 100644
--- a/src/routes/_database/databaseApis.js
+++ b/src/routes/_database/databaseApis.js
@@ -1,13 +1,13 @@
-export * from './accounts'
-export * from './clear'
-export * from './timelines/lookup'
-export * from './timelines/pinnedStatuses'
-export * from './timelines/pagination'
-export * from './timelines/getStatusOrNotification'
-export * from './timelines/updateStatus'
-export * from './timelines/deletion'
-export { insertTimelineItems, insertStatus } from './timelines/insertion'
-export * from './meta'
-export * from './relationships'
-export * from './webShare'
-export * from './mediaUploadFileCache'
+export * from './accounts.js'
+export * from './clear.js'
+export * from './timelines/lookup.js'
+export * from './timelines/pinnedStatuses.js'
+export * from './timelines/pagination.js'
+export * from './timelines/getStatusOrNotification.js'
+export * from './timelines/updateStatus.js'
+export * from './timelines/deletion.js'
+export { insertTimelineItems, insertStatus } from './timelines/insertion.js'
+export * from './meta.js'
+export * from './relationships.js'
+export * from './webShare.js'
+export * from './mediaUploadFileCache.js'
diff --git a/src/routes/_database/databaseLifecycle.js b/src/routes/_database/databaseLifecycle.js
index 8a9d9abc..0bd55ff6 100644
--- a/src/routes/_database/databaseLifecycle.js
+++ b/src/routes/_database/databaseLifecycle.js
@@ -1,10 +1,10 @@
-import { DB_VERSION_CURRENT } from './constants'
-import { addKnownInstance, deleteKnownInstance } from './knownInstances'
-import { migrations } from './migrations'
-import { clearAllCaches } from './cache'
-import { lifecycle } from '../_utils/lifecycle'
-import { scheduleIdleTask } from '../_utils/scheduleIdleTask'
-import { del } from '../_thirdparty/idb-keyval/idb-keyval'
+import { DB_VERSION_CURRENT } from './constants.js'
+import { addKnownInstance, deleteKnownInstance } from './knownInstances.js'
+import { migrations } from './migrations.js'
+import { clearAllCaches } from './cache.js'
+import { lifecycle } from '../_utils/lifecycle.js'
+import { scheduleIdleTask } from '../_utils/scheduleIdleTask.js'
+import { del } from '../_thirdparty/idb-keyval/idb-keyval.js'
 
 const openReqs = {}
 const databaseCache = {}
diff --git a/src/routes/_database/helpers.js b/src/routes/_database/helpers.js
index 4f1f12d4..f38a8bfd 100644
--- a/src/routes/_database/helpers.js
+++ b/src/routes/_database/helpers.js
@@ -1,8 +1,8 @@
-import { dbPromise, getDatabase } from './databaseLifecycle'
-import { getInCache, hasInCache, setInCache } from './cache'
+import { dbPromise, getDatabase } from './databaseLifecycle.js'
+import { getInCache, hasInCache, setInCache } from './cache.js'
 import {
   ACCOUNT_ID, REBLOG_ID, STATUS_ID, TIMESTAMP, USERNAME_LOWERCASE, CURRENT_TIME
-} from './constants'
+} from './constants.js'
 
 export async function getGenericEntityWithId (store, cache, instanceName, id) {
   if (hasInCache(cache, instanceName, id)) {
diff --git a/src/routes/_database/keys.js b/src/routes/_database/keys.js
index 0f30dc90..d612900a 100644
--- a/src/routes/_database/keys.js
+++ b/src/routes/_database/keys.js
@@ -1,4 +1,4 @@
-import { toReversePaddedBigInt, zeroPad } from '../_utils/statusIdSorting'
+import { toReversePaddedBigInt, zeroPad } from '../_utils/statusIdSorting.js'
 
 //
 // timelines
diff --git a/src/routes/_database/knownInstances.js b/src/routes/_database/knownInstances.js
index 5d276417..d44cb664 100644
--- a/src/routes/_database/knownInstances.js
+++ b/src/routes/_database/knownInstances.js
@@ -1,4 +1,4 @@
-import { set, keys, del } from '../_thirdparty/idb-keyval/idb-keyval'
+import { set, keys, del } from '../_thirdparty/idb-keyval/idb-keyval.js'
 
 const PREFIX = 'known-instance-'
 
diff --git a/src/routes/_database/mediaUploadFileCache.js b/src/routes/_database/mediaUploadFileCache.js
index 005c43b5..9fbfb46a 100644
--- a/src/routes/_database/mediaUploadFileCache.js
+++ b/src/routes/_database/mediaUploadFileCache.js
@@ -2,7 +2,7 @@
 // We keep them in IDB to avoid tainted canvas errors after a refresh.
 // https://github.com/nolanlawson/pinafore/issues/1901
 
-import { get, set, keys, del } from '../_thirdparty/idb-keyval/idb-keyval'
+import { get, set, keys, del } from '../_thirdparty/idb-keyval/idb-keyval.js'
 
 const PREFIX = 'media-cache-'
 const DELIMITER = '-cache-'
diff --git a/src/routes/_database/meta.js b/src/routes/_database/meta.js
index 35f7e500..725da5b7 100644
--- a/src/routes/_database/meta.js
+++ b/src/routes/_database/meta.js
@@ -1,6 +1,6 @@
-import { dbPromise, getDatabase } from './databaseLifecycle'
-import { META_STORE } from './constants'
-import { metaCache, hasInCache, getInCache, setInCache } from './cache'
+import { dbPromise, getDatabase } from './databaseLifecycle.js'
+import { META_STORE } from './constants.js'
+import { metaCache, hasInCache, getInCache, setInCache } from './cache.js'
 
 async function getMetaProperty (instanceName, key) {
   if (hasInCache(metaCache, instanceName, key)) {
diff --git a/src/routes/_database/migrations.js b/src/routes/_database/migrations.js
index 984c1543..56be2905 100644
--- a/src/routes/_database/migrations.js
+++ b/src/routes/_database/migrations.js
@@ -8,8 +8,8 @@ import {
   STATUS_TIMELINES_STORE,
   STATUSES_STORE, THREADS_STORE,
   TIMESTAMP, USERNAME_LOWERCASE
-} from './constants'
-import { toReversePaddedBigInt } from '../_utils/statusIdSorting'
+} from './constants.js'
+import { toReversePaddedBigInt } from '../_utils/statusIdSorting.js'
 
 function initialMigration (db, tx, done) {
   function createObjectStore (name, init, indexes) {
diff --git a/src/routes/_database/relationships.js b/src/routes/_database/relationships.js
index 0ce79aa6..e8f89211 100644
--- a/src/routes/_database/relationships.js
+++ b/src/routes/_database/relationships.js
@@ -1,6 +1,6 @@
-import { cloneForStorage, getGenericEntityWithId, setGenericEntityWithId } from './helpers'
-import { RELATIONSHIPS_STORE } from './constants'
-import { relationshipsCache } from './cache'
+import { cloneForStorage, getGenericEntityWithId, setGenericEntityWithId } from './helpers.js'
+import { RELATIONSHIPS_STORE } from './constants.js'
+import { relationshipsCache } from './cache.js'
 
 export async function getRelationship (instanceName, accountId) {
   return getGenericEntityWithId(RELATIONSHIPS_STORE, relationshipsCache, instanceName, accountId)
diff --git a/src/routes/_database/timelines/cacheStatus.js b/src/routes/_database/timelines/cacheStatus.js
index 55b39c8a..cf40741d 100644
--- a/src/routes/_database/timelines/cacheStatus.js
+++ b/src/routes/_database/timelines/cacheStatus.js
@@ -1,6 +1,6 @@
 import {
   accountsCache, setInCache, statusesCache
-} from '../cache'
+} from '../cache.js'
 
 export function cacheStatus (status, instanceName) {
   setInCache(statusesCache, instanceName, status.id, status)
diff --git a/src/routes/_database/timelines/deletion.js b/src/routes/_database/timelines/deletion.js
index 3efb6e9d..452905f4 100644
--- a/src/routes/_database/timelines/deletion.js
+++ b/src/routes/_database/timelines/deletion.js
@@ -1,19 +1,19 @@
-import { dbPromise, getDatabase } from '../databaseLifecycle'
+import { dbPromise, getDatabase } from '../databaseLifecycle.js'
 import {
   deleteFromCache, notificationsCache,
   statusesCache
-} from '../cache'
+} from '../cache.js'
 import {
   NOTIFICATION_TIMELINES_STORE,
   NOTIFICATIONS_STORE, PINNED_STATUSES_STORE,
   STATUS_TIMELINES_STORE,
   STATUSES_STORE,
   THREADS_STORE
-} from '../constants'
+} from '../constants.js'
 import {
   createThreadKeyRange
-} from '../keys'
-import { deleteAll } from '../utils'
+} from '../keys.js'
+import { deleteAll } from '../utils.js'
 
 export async function deleteStatusesAndNotifications (instanceName, statusIds, notificationIds) {
   for (const statusId of statusIds) {
diff --git a/src/routes/_database/timelines/fetchNotification.js b/src/routes/_database/timelines/fetchNotification.js
index 13ddab1e..93b35ab4 100644
--- a/src/routes/_database/timelines/fetchNotification.js
+++ b/src/routes/_database/timelines/fetchNotification.js
@@ -1,6 +1,6 @@
-import { fetchAccount } from './fetchAccount'
-import { ACCOUNT_ID, STATUS_ID } from '../constants'
-import { fetchStatus } from './fetchStatus'
+import { fetchAccount } from './fetchAccount.js'
+import { ACCOUNT_ID, STATUS_ID } from '../constants.js'
+import { fetchStatus } from './fetchStatus.js'
 
 export function fetchNotification (notificationsStore, statusesStore, accountsStore, id, callback) {
   notificationsStore.get(id).onsuccess = e => {
diff --git a/src/routes/_database/timelines/fetchStatus.js b/src/routes/_database/timelines/fetchStatus.js
index 678e8ba9..9ea997f9 100644
--- a/src/routes/_database/timelines/fetchStatus.js
+++ b/src/routes/_database/timelines/fetchStatus.js
@@ -1,5 +1,5 @@
-import { fetchAccount } from './fetchAccount'
-import { ACCOUNT_ID, REBLOG_ID } from '../constants'
+import { fetchAccount } from './fetchAccount.js'
+import { ACCOUNT_ID, REBLOG_ID } from '../constants.js'
 
 export function fetchStatus (statusesStore, accountsStore, id, callback) {
   statusesStore.get(id).onsuccess = e => {
diff --git a/src/routes/_database/timelines/getStatusOrNotification.js b/src/routes/_database/timelines/getStatusOrNotification.js
index ea44b7ea..edd2c468 100644
--- a/src/routes/_database/timelines/getStatusOrNotification.js
+++ b/src/routes/_database/timelines/getStatusOrNotification.js
@@ -1,12 +1,12 @@
-import { dbPromise, getDatabase } from '../databaseLifecycle'
-import { getInCache, hasInCache, notificationsCache, setInCache, statusesCache } from '../cache'
+import { dbPromise, getDatabase } from '../databaseLifecycle.js'
+import { getInCache, hasInCache, notificationsCache, setInCache, statusesCache } from '../cache.js'
 import {
   ACCOUNTS_STORE,
   NOTIFICATIONS_STORE,
   STATUSES_STORE
-} from '../constants'
-import { fetchStatus } from './fetchStatus'
-import { fetchNotification } from './fetchNotification'
+} from '../constants.js'
+import { fetchStatus } from './fetchStatus.js'
+import { fetchNotification } from './fetchNotification.js'
 
 export async function getStatus (instanceName, id) {
   if (hasInCache(statusesCache, instanceName, id)) {
diff --git a/src/routes/_database/timelines/insertion.js b/src/routes/_database/timelines/insertion.js
index 94f4e41b..4f214974 100644
--- a/src/routes/_database/timelines/insertion.js
+++ b/src/routes/_database/timelines/insertion.js
@@ -1,9 +1,9 @@
-import difference from 'lodash-es/difference'
-import times from 'lodash-es/times'
-import { cloneForStorage } from '../helpers'
-import { dbPromise, getDatabase } from '../databaseLifecycle'
-import { accountsCache, notificationsCache, setInCache, statusesCache } from '../cache'
-import { scheduleCleanup } from '../cleanup'
+import { difference } from '../../_thirdparty/lodash/objects.js'
+import { times } from '../../_utils/lodash-lite.js'
+import { cloneForStorage } from '../helpers.js'
+import { dbPromise, getDatabase } from '../databaseLifecycle.js'
+import { accountsCache, notificationsCache, setInCache, statusesCache } from '../cache.js'
+import { scheduleCleanup } from '../cleanup.js'
 import {
   ACCOUNTS_STORE,
   NOTIFICATION_TIMELINES_STORE,
@@ -11,13 +11,13 @@ import {
   STATUS_TIMELINES_STORE,
   STATUSES_STORE,
   THREADS_STORE
-} from '../constants'
+} from '../constants.js'
 import {
   createThreadId,
   createThreadKeyRange,
   createTimelineId
-} from '../keys'
-import { cacheStatus } from './cacheStatus'
+} from '../keys.js'
+import { cacheStatus } from './cacheStatus.js'
 
 export function putStatus (statusesStore, status) {
   statusesStore.put(cloneForStorage(status))
diff --git a/src/routes/_database/timelines/lookup.js b/src/routes/_database/timelines/lookup.js
index 39544b34..c30744a5 100644
--- a/src/routes/_database/timelines/lookup.js
+++ b/src/routes/_database/timelines/lookup.js
@@ -1,5 +1,5 @@
-import { dbPromise, getDatabase } from '../databaseLifecycle'
-import { STATUSES_STORE, STATUS_ID, REBLOG_ID, NOTIFICATIONS_STORE } from '../constants'
+import { dbPromise, getDatabase } from '../databaseLifecycle.js'
+import { STATUSES_STORE, STATUS_ID, REBLOG_ID, NOTIFICATIONS_STORE } from '../constants.js'
 
 export async function getReblogsForStatus (instanceName, id) {
   const db = await getDatabase(instanceName)
diff --git a/src/routes/_database/timelines/pagination.js b/src/routes/_database/timelines/pagination.js
index 90c1c2f4..1aca69dc 100644
--- a/src/routes/_database/timelines/pagination.js
+++ b/src/routes/_database/timelines/pagination.js
@@ -1,4 +1,4 @@
-import { dbPromise, getDatabase } from '../databaseLifecycle'
+import { dbPromise, getDatabase } from '../databaseLifecycle.js'
 import {
   ACCOUNTS_STORE,
   NOTIFICATION_TIMELINES_STORE,
@@ -6,14 +6,14 @@ import {
   STATUS_TIMELINES_STORE,
   STATUSES_STORE,
   THREADS_STORE
-} from '../constants'
+} from '../constants.js'
 import {
   createThreadKeyRange,
   createTimelineKeyRange
-} from '../keys'
-import { fetchStatus } from './fetchStatus'
-import { fetchNotification } from './fetchNotification'
-import { TIMELINE_BATCH_SIZE } from '../../_static/timelines'
+} from '../keys.js'
+import { fetchStatus } from './fetchStatus.js'
+import { fetchNotification } from './fetchNotification.js'
+import { TIMELINE_BATCH_SIZE } from '../../_static/timelines.js'
 
 async function getNotificationTimeline (instanceName, timeline, maxId, limit) {
   const storeNames = [NOTIFICATION_TIMELINES_STORE, NOTIFICATIONS_STORE, STATUSES_STORE, ACCOUNTS_STORE]
diff --git a/src/routes/_database/timelines/pinnedStatuses.js b/src/routes/_database/timelines/pinnedStatuses.js
index 57faad31..dfd5bc74 100644
--- a/src/routes/_database/timelines/pinnedStatuses.js
+++ b/src/routes/_database/timelines/pinnedStatuses.js
@@ -1,9 +1,9 @@
-import { cacheStatus } from './cacheStatus'
-import { getDatabase, dbPromise } from '../databaseLifecycle'
-import { PINNED_STATUSES_STORE, STATUSES_STORE, ACCOUNTS_STORE } from '../constants'
-import { createPinnedStatusId, createPinnedStatusKeyRange } from '../keys'
-import { storeStatus } from './insertion'
-import { fetchStatus } from './fetchStatus'
+import { cacheStatus } from './cacheStatus.js'
+import { getDatabase, dbPromise } from '../databaseLifecycle.js'
+import { PINNED_STATUSES_STORE, STATUSES_STORE, ACCOUNTS_STORE } from '../constants.js'
+import { createPinnedStatusId, createPinnedStatusKeyRange } from '../keys.js'
+import { storeStatus } from './insertion.js'
+import { fetchStatus } from './fetchStatus.js'
 
 export async function insertPinnedStatuses (instanceName, accountId, statuses) {
   for (const status of statuses) {
diff --git a/src/routes/_database/timelines/updateStatus.js b/src/routes/_database/timelines/updateStatus.js
index 3da25a5b..89396e35 100644
--- a/src/routes/_database/timelines/updateStatus.js
+++ b/src/routes/_database/timelines/updateStatus.js
@@ -1,8 +1,8 @@
-import { dbPromise, getDatabase } from '../databaseLifecycle'
-import { getInCache, hasInCache, statusesCache } from '../cache'
-import { STATUSES_STORE } from '../constants'
-import { cacheStatus } from './cacheStatus'
-import { putStatus } from './insertion'
+import { dbPromise, getDatabase } from '../databaseLifecycle.js'
+import { getInCache, hasInCache, statusesCache } from '../cache.js'
+import { STATUSES_STORE } from '../constants.js'
+import { cacheStatus } from './cacheStatus.js'
+import { putStatus } from './insertion.js'
 
 //
 // update statuses
diff --git a/src/routes/_database/webShare.js b/src/routes/_database/webShare.js
index 2d54f130..685672b5 100644
--- a/src/routes/_database/webShare.js
+++ b/src/routes/_database/webShare.js
@@ -1,5 +1,5 @@
-import { get, set, close, del } from '../_thirdparty/idb-keyval/idb-keyval'
-import { WEB_SHARE_TARGET_DATA_IDB_KEY } from '../_static/share'
+import { get, set, close, del } from '../_thirdparty/idb-keyval/idb-keyval.js'
+import { WEB_SHARE_TARGET_DATA_IDB_KEY } from '../_static/share.js'
 
 export function deleteWebShareData () {
   return del(WEB_SHARE_TARGET_DATA_IDB_KEY)
diff --git a/src/routes/_intl/formatTimeagoDate.js b/src/routes/_intl/formatTimeagoDate.js
index 4757351f..fbcbae42 100644
--- a/src/routes/_intl/formatTimeagoDate.js
+++ b/src/routes/_intl/formatTimeagoDate.js
@@ -1,5 +1,5 @@
-import { format } from '../_thirdparty/timeago/timeago'
-import { mark, stop } from '../_utils/marks'
+import { format } from '../_thirdparty/timeago/timeago.js'
+import { mark, stop } from '../_utils/marks.js'
 
 // Format a date in the past
 export function formatTimeagoDate (date, now) {
diff --git a/src/routes/_layout.html b/src/routes/_layout.html
index b55b00e6..9662b1f0 100644
--- a/src/routes/_layout.html
+++ b/src/routes/_layout.html
@@ -15,7 +15,7 @@
   }
 </style>
 <script>
-  import { store } from './_store/store'
+  import { store } from './_store/store.js'
   import { observe } from 'svelte-extras'
 
   export default {
diff --git a/src/routes/_pages/accounts/[accountId]/followers.html b/src/routes/_pages/accounts/[accountId]/followers.html
index 82e933f3..29e96378 100644
--- a/src/routes/_pages/accounts/[accountId]/followers.html
+++ b/src/routes/_pages/accounts/[accountId]/followers.html
@@ -1,9 +1,9 @@
 <DynamicPageBanner title="{intl.followers}" />
 <AccountsListPage {accountsFetcher} />
 <script>
-  import { getFollowers } from '../../../_api/followsAndFollowers'
+  import { getFollowers } from '../../../_api/followsAndFollowers.js'
   import AccountsListPage from '../../../_components/AccountsListPage.html'
-  import { store } from '../../../_store/store'
+  import { store } from '../../../_store/store.js'
   import DynamicPageBanner from '../../../_components/DynamicPageBanner.html'
 
   export default {
diff --git a/src/routes/_pages/accounts/[accountId]/follows.html b/src/routes/_pages/accounts/[accountId]/follows.html
index 3e42a3cf..e8ed7bfb 100644
--- a/src/routes/_pages/accounts/[accountId]/follows.html
+++ b/src/routes/_pages/accounts/[accountId]/follows.html
@@ -1,9 +1,9 @@
 <DynamicPageBanner title="{intl.follows}" />
 <AccountsListPage {accountsFetcher} />
 <script>
-  import { getFollows } from '../../../_api/followsAndFollowers'
+  import { getFollows } from '../../../_api/followsAndFollowers.js'
   import AccountsListPage from '../../../_components/AccountsListPage.html'
-  import { store } from '../../../_store/store'
+  import { store } from '../../../_store/store.js'
   import DynamicPageBanner from '../../../_components/DynamicPageBanner.html'
 
   export default {
diff --git a/src/routes/_pages/blocked.html b/src/routes/_pages/blocked.html
index 453bf25f..bf9bc1dd 100644
--- a/src/routes/_pages/blocked.html
+++ b/src/routes/_pages/blocked.html
@@ -4,10 +4,10 @@
 {/if}
 <script>
   import AccountsListPage from '../_components/AccountsListPage.html'
-  import { store } from '../_store/store'
-  import { getBlockedAccounts } from '../_api/blockedAndMuted'
+  import { store } from '../_store/store.js'
+  import { getBlockedAccounts } from '../_api/blockedAndMuted.js'
   import DynamicPageBanner from '../_components/DynamicPageBanner.html'
-  import { setAccountBlocked } from '../_actions/block'
+  import { setAccountBlocked } from '../_actions/block.js'
 
   export default {
     data: () => ({
diff --git a/src/routes/_pages/bookmarks.html b/src/routes/_pages/bookmarks.html
index 19efc3c6..73f74a96 100644
--- a/src/routes/_pages/bookmarks.html
+++ b/src/routes/_pages/bookmarks.html
@@ -17,7 +17,7 @@
   import TimelinePage from '../_components/TimelinePage.html'
   import FreeTextLayout from '../_components/FreeTextLayout.html'
   import { store } from '../_store/store.js'
-  import HiddenFromSSR from '../_components/HiddenFromSSR'
+  import HiddenFromSSR from '../_components/HiddenFromSSR.html'
   import DynamicPageBanner from '../_components/DynamicPageBanner.html'
 
   export default {
diff --git a/src/routes/_pages/community/index.html b/src/routes/_pages/community/index.html
index 49ec5c30..31d3dd2d 100644
--- a/src/routes/_pages/community/index.html
+++ b/src/routes/_pages/community/index.html
@@ -101,14 +101,14 @@
 <script>
   import FreeTextLayout from '../../_components/FreeTextLayout.html'
   import { store } from '../../_store/store.js'
-  import HiddenFromSSR from '../../_components/HiddenFromSSR'
+  import HiddenFromSSR from '../../_components/HiddenFromSSR.html'
   import PageList from '../../_components/community/PageList.html'
   import PageListItem from '../../_components/community/PageListItem.html'
   import RadioGroup from '../../_components/radio/RadioGroup.html'
-  import { updateListsForInstance } from '../../_actions/lists'
-  import { updateFollowRequestCountIfLockedAccount } from '../../_actions/followRequests'
+  import { updateListsForInstance } from '../../_actions/lists.js'
+  import { updateFollowRequestCountIfLockedAccount } from '../../_actions/followRequests.js'
   import FocusRestoration from '../../_components/FocusRestoration.html'
-  import { formatIntl } from '../../_utils/formatIntl'
+  import { formatIntl } from '../../_utils/formatIntl.js'
 
   export default {
     async oncreate () {
diff --git a/src/routes/_pages/direct.html b/src/routes/_pages/direct.html
index 62c13beb..36d67597 100644
--- a/src/routes/_pages/direct.html
+++ b/src/routes/_pages/direct.html
@@ -17,7 +17,7 @@
   import TimelinePage from '../_components/TimelinePage.html'
   import FreeTextLayout from '../_components/FreeTextLayout.html'
   import { store } from '../_store/store.js'
-  import HiddenFromSSR from '../_components/HiddenFromSSR'
+  import HiddenFromSSR from '../_components/HiddenFromSSR.html'
   import DynamicPageBanner from '../_components/DynamicPageBanner.html'
 
   export default {
diff --git a/src/routes/_pages/favorites.html b/src/routes/_pages/favorites.html
index 8ecb1b77..ee78bfc3 100644
--- a/src/routes/_pages/favorites.html
+++ b/src/routes/_pages/favorites.html
@@ -17,7 +17,7 @@
   import TimelinePage from '../_components/TimelinePage.html'
   import FreeTextLayout from '../_components/FreeTextLayout.html'
   import { store } from '../_store/store.js'
-  import HiddenFromSSR from '../_components/HiddenFromSSR'
+  import HiddenFromSSR from '../_components/HiddenFromSSR.html'
   import DynamicPageBanner from '../_components/DynamicPageBanner.html'
 
   export default {
diff --git a/src/routes/_pages/federated.html b/src/routes/_pages/federated.html
index 0ea5c986..dbcf6a53 100644
--- a/src/routes/_pages/federated.html
+++ b/src/routes/_pages/federated.html
@@ -17,7 +17,7 @@
   import TimelinePage from '../_components/TimelinePage.html'
   import FreeTextLayout from '../_components/FreeTextLayout.html'
   import { store } from '../_store/store.js'
-  import HiddenFromSSR from '../_components/HiddenFromSSR'
+  import HiddenFromSSR from '../_components/HiddenFromSSR.html'
   import DynamicPageBanner from '../_components/DynamicPageBanner.html'
 
   export default {
diff --git a/src/routes/_pages/index.html b/src/routes/_pages/index.html
index dc5425a7..75741f77 100644
--- a/src/routes/_pages/index.html
+++ b/src/routes/_pages/index.html
@@ -8,7 +8,7 @@
   import { store } from '../_store/store.js'
   import TimelineHomePage from '../_components/TimelineHomePage.html'
   import { observe } from 'svelte-extras'
-  import { doQuickLoginIfNecessary } from '../_actions/doQuickLoginIfNecessary'
+  import { doQuickLoginIfNecessary } from '../_actions/doQuickLoginIfNecessary.js'
 
   export default {
     async oncreate () {
diff --git a/src/routes/_pages/lists/[listId].html b/src/routes/_pages/lists/[listId].html
index fa212202..0d52a347 100644
--- a/src/routes/_pages/lists/[listId].html
+++ b/src/routes/_pages/lists/[listId].html
@@ -17,7 +17,7 @@
   import TimelinePage from '../../_components/TimelinePage.html'
   import FreeTextLayout from '../../_components/FreeTextLayout.html'
   import { store } from '../../_store/store.js'
-  import HiddenFromSSR from '../../_components/HiddenFromSSR'
+  import HiddenFromSSR from '../../_components/HiddenFromSSR.html'
   import DynamicPageBanner from '../../_components/DynamicPageBanner.html'
 
   export default {
diff --git a/src/routes/_pages/local.html b/src/routes/_pages/local.html
index aaa84e58..e2cf2571 100644
--- a/src/routes/_pages/local.html
+++ b/src/routes/_pages/local.html
@@ -17,7 +17,7 @@
   import TimelinePage from '../_components/TimelinePage.html'
   import FreeTextLayout from '../_components/FreeTextLayout.html'
   import { store } from '../_store/store.js'
-  import HiddenFromSSR from '../_components/HiddenFromSSR'
+  import HiddenFromSSR from '../_components/HiddenFromSSR.html'
   import DynamicPageBanner from '../_components/DynamicPageBanner.html'
 
   export default {
diff --git a/src/routes/_pages/muted.html b/src/routes/_pages/muted.html
index 70eac360..0f3e0d3b 100644
--- a/src/routes/_pages/muted.html
+++ b/src/routes/_pages/muted.html
@@ -4,10 +4,10 @@
 {/if}
 <script>
   import AccountsListPage from '../_components/AccountsListPage.html'
-  import { store } from '../_store/store'
-  import { getMutedAccounts } from '../_api/blockedAndMuted'
+  import { store } from '../_store/store.js'
+  import { getMutedAccounts } from '../_api/blockedAndMuted.js'
   import DynamicPageBanner from '../_components/DynamicPageBanner.html'
-  import { setAccountMuted } from '../_actions/mute'
+  import { setAccountMuted } from '../_actions/mute.js'
 
   export default {
     data: () => ({
diff --git a/src/routes/_pages/notifications/index.html b/src/routes/_pages/notifications/index.html
index 3e125e09..ddf28c3a 100644
--- a/src/routes/_pages/notifications/index.html
+++ b/src/routes/_pages/notifications/index.html
@@ -17,7 +17,7 @@
 <script>
   import FreeTextLayout from '../../_components/FreeTextLayout.html'
   import { store } from '../../_store/store.js'
-  import HiddenFromSSR from '../../_components/HiddenFromSSR'
+  import HiddenFromSSR from '../../_components/HiddenFromSSR.html'
   import TimelinePage from '../../_components/TimelinePage.html'
   import NotificationFilters from '../../_components/NotificationFilters.html'
 
diff --git a/src/routes/_pages/notifications/mentions.html b/src/routes/_pages/notifications/mentions.html
index fd8e76b1..0f38f708 100644
--- a/src/routes/_pages/notifications/mentions.html
+++ b/src/routes/_pages/notifications/mentions.html
@@ -13,7 +13,7 @@
 <script>
   import FreeTextLayout from '../../_components/FreeTextLayout.html'
   import { store } from '../../_store/store.js'
-  import HiddenFromSSR from '../../_components/HiddenFromSSR'
+  import HiddenFromSSR from '../../_components/HiddenFromSSR.html'
   import TimelinePage from '../../_components/TimelinePage.html'
   import NotificationFilters from '../../_components/NotificationFilters.html'
 
diff --git a/src/routes/_pages/pinned.html b/src/routes/_pages/pinned.html
index 82d70dd8..da23f1fa 100644
--- a/src/routes/_pages/pinned.html
+++ b/src/routes/_pages/pinned.html
@@ -30,14 +30,14 @@
   }
 </style>
 <script>
-  import { store } from '../_store/store'
+  import { store } from '../_store/store.js'
   import LoadingPage from '../_components/LoadingPage.html'
   import StatusSearchResult from '../_components/search/StatusSearchResult.html'
-  import { toast } from '../_components/toast/toast'
+  import { toast } from '../_components/toast/toast.js'
   import DynamicPageBanner from '../_components/DynamicPageBanner.html'
-  import { getPinnedStatuses } from '../_api/pinnedStatuses'
-  import { updateVerifyCredentialsForInstance } from '../_actions/instances'
-  import { formatIntl } from '../_utils/formatIntl'
+  import { getPinnedStatuses } from '../_api/pinnedStatuses.js'
+  import { updateVerifyCredentialsForInstance } from '../_actions/instances.js'
+  import { formatIntl } from '../_utils/formatIntl.js'
 
   export default {
     async oncreate () {
diff --git a/src/routes/_pages/requests.html b/src/routes/_pages/requests.html
index 0161cfb1..998b3d87 100644
--- a/src/routes/_pages/requests.html
+++ b/src/routes/_pages/requests.html
@@ -4,11 +4,11 @@
 {/if}
 <script>
   import AccountsListPage from '../_components/AccountsListPage.html'
-  import { store } from '../_store/store'
-  import { getFollowRequests } from '../_api/followRequests'
+  import { store } from '../_store/store.js'
+  import { getFollowRequests } from '../_api/followRequests.js'
   import DynamicPageBanner from '../_components/DynamicPageBanner.html'
-  import { setFollowRequestApprovedOrRejected } from '../_actions/requests'
-  import { database } from '../_database/database'
+  import { setFollowRequestApprovedOrRejected } from '../_actions/requests.js'
+  import { database } from '../_database/database.js'
 
   // sneakily update the follow reqs count in the cache, since we just fetched it
   function updateFollowReqsCount ($currentInstance, followReqs) {
diff --git a/src/routes/_pages/search.html b/src/routes/_pages/search.html
index 0edd6f4e..e7545a41 100644
--- a/src/routes/_pages/search.html
+++ b/src/routes/_pages/search.html
@@ -35,7 +35,7 @@
 <script>
   import FreeTextLayout from '../_components/FreeTextLayout.html'
   import { store } from '../_store/store.js'
-  import HiddenFromSSR from '../_components/HiddenFromSSR'
+  import HiddenFromSSR from '../_components/HiddenFromSSR.html'
   import Search from '../_components/search/Search.html'
 
   export default {
diff --git a/src/routes/_pages/settings/general.html b/src/routes/_pages/settings/general.html
index 303698af..cc43e6ba 100644
--- a/src/routes/_pages/settings/general.html
+++ b/src/routes/_pages/settings/general.html
@@ -102,10 +102,10 @@
 <script>
   import SettingsLayout from '../../_components/settings/SettingsLayout.html'
   import ThemeSettings from '../../_components/settings/instance/ThemeSettings.html'
-  import { store } from '../../_store/store'
+  import { store } from '../../_store/store.js'
   import Tooltip from '../../_components/Tooltip.html'
   import UISettingsStyles from '../../_components/settings/UISettingsStyles.html'
-  import { formatIntl } from '../../_utils/formatIntl'
+  import { formatIntl } from '../../_utils/formatIntl.js'
 
   export default {
     components: {
diff --git a/src/routes/_pages/settings/hotkeys.html b/src/routes/_pages/settings/hotkeys.html
index c44deb19..7be2b53f 100644
--- a/src/routes/_pages/settings/hotkeys.html
+++ b/src/routes/_pages/settings/hotkeys.html
@@ -38,8 +38,8 @@
 <script>
   import SettingsLayout from '../../_components/settings/SettingsLayout.html'
   import ShortcutHelpInfo from '../../_components/ShortcutHelpInfo.html'
-  import { store } from '../../_store/store'
-  import { isKaiOS } from '../../_utils/userAgent/isKaiOS'
+  import { store } from '../../_store/store.js'
+  import { isKaiOS } from '../../_utils/userAgent/isKaiOS.js'
   import UISettingsStyles from '../../_components/settings/UISettingsStyles.html'
 
   export default {
diff --git a/src/routes/_pages/settings/instances/[instanceName].html b/src/routes/_pages/settings/instances/[instanceName].html
index 05a776a8..cb40a534 100644
--- a/src/routes/_pages/settings/instances/[instanceName].html
+++ b/src/routes/_pages/settings/instances/[instanceName].html
@@ -25,7 +25,7 @@
   }
 </style>
 <script>
-  import { store } from '../../../_store/store'
+  import { store } from '../../../_store/store.js'
   import SettingsLayout from '../../../_components/settings/SettingsLayout.html'
   import InstanceUserProfile from '../../../_components/settings/instance/InstanceUserProfile.html'
   import HomeTimelineFilterSettings from '../../../_components/settings/instance/HomeTimelineFilterSettings.html'
@@ -34,8 +34,8 @@
   import ThemeSettings from '../../../_components/settings/instance/ThemeSettings.html'
   import InstanceActions from '../../../_components/settings/instance/InstanceActions.html'
   import WordFilterSettings from '../../../_components/settings/instance/WordFilterSettings.html'
-  import { updateVerifyCredentialsForInstance } from '../../../_actions/instances'
-  import { updateFiltersForInstance } from '../../../_actions/filters'
+  import { updateVerifyCredentialsForInstance } from '../../../_actions/instances.js'
+  import { updateFiltersForInstance } from '../../../_actions/filters.js'
 
   export default {
     async oncreate () {
diff --git a/src/routes/_pages/settings/instances/add.html b/src/routes/_pages/settings/instances/add.html
index 479e2227..b57af49a 100644
--- a/src/routes/_pages/settings/instances/add.html
+++ b/src/routes/_pages/settings/instances/add.html
@@ -82,9 +82,9 @@
 </style>
 <script>
   import SettingsLayout from '../../../_components/settings/SettingsLayout.html'
-  import { store } from '../../../_store/store'
-  import { logInToInstance, handleOauthCode } from '../../../_actions/addInstance'
-  import { testHasIndexedDB, testHasLocalStorage } from '../../../_utils/testStorage'
+  import { store } from '../../../_store/store.js'
+  import { logInToInstance, handleOauthCode } from '../../../_actions/addInstance.js'
+  import { testHasIndexedDB, testHasLocalStorage } from '../../../_utils/testStorage.js'
   import Tooltip from '../../../_components/Tooltip.html'
 
   export default {
diff --git a/src/routes/_pages/settings/instances/index.html b/src/routes/_pages/settings/instances/index.html
index 8d0a0dc4..da811f31 100644
--- a/src/routes/_pages/settings/instances/index.html
+++ b/src/routes/_pages/settings/instances/index.html
@@ -72,8 +72,8 @@
   }
 </style>
 <script>
-  import { store } from '../../../_store/store'
-  import { switchToInstance } from '../../../_actions/instances'
+  import { store } from '../../../_store/store.js'
+  import { switchToInstance } from '../../../_actions/instances.js'
   import SettingsLayout from '../../../_components/settings/SettingsLayout.html'
   import SettingsList from '../../../_components/settings/SettingsList.html'
   import SettingsListRow from '../../../_components/settings/SettingsListRow.html'
@@ -81,7 +81,7 @@
   import SvgIcon from '../../../_components/SvgIcon.html'
   import RadioGroup from '../../../_components/radio/RadioGroup.html'
   import RadioGroupButton from '../../../_components/radio/RadioGroupButton.html'
-  import { formatIntl } from '../../../_utils/formatIntl'
+  import { formatIntl } from '../../../_utils/formatIntl.js'
 
   export default {
     components: {
diff --git a/src/routes/_pages/settings/wellness.html b/src/routes/_pages/settings/wellness.html
index a1a21253..6162e5f1 100644
--- a/src/routes/_pages/settings/wellness.html
+++ b/src/routes/_pages/settings/wellness.html
@@ -75,7 +75,7 @@
 </style>
 <script>
   import SettingsLayout from '../../_components/settings/SettingsLayout.html'
-  import { store } from '../../_store/store'
+  import { store } from '../../_store/store.js'
   import InfoAside from '../../_components/InfoAside.html'
   import UISettingsStyles from '../../_components/settings/UISettingsStyles.html'
 
diff --git a/src/routes/_pages/statuses/[statusId]/favorites.html b/src/routes/_pages/statuses/[statusId]/favorites.html
index 56282900..a11278fc 100644
--- a/src/routes/_pages/statuses/[statusId]/favorites.html
+++ b/src/routes/_pages/statuses/[statusId]/favorites.html
@@ -1,9 +1,9 @@
 <DynamicPageBanner title="{intl.favorites}" icon="#fa-star" />
 <AccountsListPage {accountsFetcher} />
 <script>
-  import { getFavorites } from '../../../_api/reblogsAndFavs'
+  import { getFavorites } from '../../../_api/reblogsAndFavs.js'
   import AccountsListPage from '../../../_components/AccountsListPage.html'
-  import { store } from '../../../_store/store'
+  import { store } from '../../../_store/store.js'
   import DynamicPageBanner from '../../../_components/DynamicPageBanner.html'
 
   export default {
diff --git a/src/routes/_pages/statuses/[statusId]/index.html b/src/routes/_pages/statuses/[statusId]/index.html
index 81108f78..8cad38bb 100644
--- a/src/routes/_pages/statuses/[statusId]/index.html
+++ b/src/routes/_pages/statuses/[statusId]/index.html
@@ -14,7 +14,7 @@
 <script>
   import FreeTextLayout from '../../../_components/FreeTextLayout.html'
   import { store } from '../../../_store/store.js'
-  import HiddenFromSSR from '../../../_components/HiddenFromSSR'
+  import HiddenFromSSR from '../../../_components/HiddenFromSSR.html'
   import DynamicPageBanner from '../../../_components/DynamicPageBanner.html'
   import TimelinePage from '../../../_components/TimelinePage.html'
 
diff --git a/src/routes/_pages/statuses/[statusId]/reblogs.html b/src/routes/_pages/statuses/[statusId]/reblogs.html
index 81d114d8..a2baf166 100644
--- a/src/routes/_pages/statuses/[statusId]/reblogs.html
+++ b/src/routes/_pages/statuses/[statusId]/reblogs.html
@@ -1,9 +1,9 @@
 <DynamicPageBanner title="{intl.reblogs}" icon="#fa-retweet" />
 <AccountsListPage {accountsFetcher} />
 <script>
-  import { getReblogs } from '../../../_api/reblogsAndFavs'
+  import { getReblogs } from '../../../_api/reblogsAndFavs.js'
   import AccountsListPage from '../../../_components/AccountsListPage.html'
-  import { store } from '../../../_store/store'
+  import { store } from '../../../_store/store.js'
   import DynamicPageBanner from '../../../_components/DynamicPageBanner.html'
 
   export default {
diff --git a/src/routes/_pages/tags/[tagName].html b/src/routes/_pages/tags/[tagName].html
index 4db907eb..7843fb36 100644
--- a/src/routes/_pages/tags/[tagName].html
+++ b/src/routes/_pages/tags/[tagName].html
@@ -15,7 +15,7 @@
   import TimelinePage from '../../_components/TimelinePage.html'
   import FreeTextLayout from '../../_components/FreeTextLayout.html'
   import { store } from '../../_store/store.js'
-  import HiddenFromSSR from '../../_components/HiddenFromSSR'
+  import HiddenFromSSR from '../../_components/HiddenFromSSR.html'
   import DynamicPageBanner from '../../_components/DynamicPageBanner.html'
 
   export default {
diff --git a/src/routes/_static/emojiPickerIntl.js b/src/routes/_static/emojiPickerIntl.js
index 56407273..9323dd95 100644
--- a/src/routes/_static/emojiPickerIntl.js
+++ b/src/routes/_static/emojiPickerIntl.js
@@ -1,4 +1,4 @@
-import { LOCALE } from './intl'
+import { LOCALE } from './intl.js'
 
 export const emojiPickerDataSource = `/emoji-${LOCALE}.json`
 
diff --git a/src/routes/_static/media.js b/src/routes/_static/media.js
index 7f1fcc6c..2f228181 100644
--- a/src/routes/_static/media.js
+++ b/src/routes/_static/media.js
@@ -1,4 +1,4 @@
-import { isIOSPre13 } from '../_utils/userAgent/isIOSPre13'
+import { isIOSPre13 } from '../_utils/userAgent/isIOSPre13.js'
 
 export const DEFAULT_MEDIA_WIDTH = 300
 export const DEFAULT_MEDIA_HEIGHT = 250
diff --git a/src/routes/_store/LocalStorageStore.js b/src/routes/_store/LocalStorageStore.js
index 3eed3403..d471183a 100644
--- a/src/routes/_store/LocalStorageStore.js
+++ b/src/routes/_store/LocalStorageStore.js
@@ -1,7 +1,9 @@
-import { Store } from 'svelte/store'
-import { safeLocalStorage as LS } from '../_utils/safeLocalStorage'
-import { lifecycle } from '../_utils/lifecycle'
-import { safeParse } from '../_utils/safeParse'
+import { safeLocalStorage as LS } from '../_utils/safeLocalStorage.js'
+import { lifecycle } from '../_utils/lifecycle.js'
+import { safeParse } from '../_utils/safeParse.js'
+import * as storePackage from 'svelte/store.umd.js'
+
+const { Store } = storePackage
 
 export class LocalStorageStore extends Store {
   constructor (state, keysToWatch) {
diff --git a/src/routes/_store/computations/autosuggestComputations.js b/src/routes/_store/computations/autosuggestComputations.js
index 3993b4c2..2e3f98f9 100644
--- a/src/routes/_store/computations/autosuggestComputations.js
+++ b/src/routes/_store/computations/autosuggestComputations.js
@@ -1,5 +1,5 @@
-import { get } from '../../_utils/lodash-lite'
-import { mark, stop } from '../../_utils/marks'
+import { get } from '../../_utils/lodash-lite.js'
+import { mark, stop } from '../../_utils/marks.js'
 
 const MIN_PREFIX_LENGTH = 2
 // Technically mastodon accounts allow dots, but it would be weird to do an autosuggest search if it ends with a dot.
diff --git a/src/routes/_store/computations/badgeComputations.js b/src/routes/_store/computations/badgeComputations.js
index ca78f906..ed00444d 100644
--- a/src/routes/_store/computations/badgeComputations.js
+++ b/src/routes/_store/computations/badgeComputations.js
@@ -1,4 +1,4 @@
-import { get } from '../../_utils/lodash-lite'
+import { get } from '../../_utils/lodash-lite.js'
 
 export function badgeComputations (store) {
   store.compute('numberOfNotifications',
diff --git a/src/routes/_store/computations/computations.js b/src/routes/_store/computations/computations.js
index 0888cc28..cb5f422b 100644
--- a/src/routes/_store/computations/computations.js
+++ b/src/routes/_store/computations/computations.js
@@ -1,5 +1,5 @@
-import { instanceComputations } from './instanceComputations'
-import { navComputations } from './navComputations'
+import { instanceComputations } from './instanceComputations.js'
+import { navComputations } from './navComputations.js'
 
 export function computations (store) {
   instanceComputations(store)
diff --git a/src/routes/_store/computations/instanceComputations.js b/src/routes/_store/computations/instanceComputations.js
index 14e70855..48154c32 100644
--- a/src/routes/_store/computations/instanceComputations.js
+++ b/src/routes/_store/computations/instanceComputations.js
@@ -1,5 +1,5 @@
-import { DEFAULT_THEME } from '../../_utils/themeEngine'
-import { mark, stop } from '../../_utils/marks'
+import { DEFAULT_THEME } from '../../_utils/themeEngine.js'
+import { mark, stop } from '../../_utils/marks.js'
 
 function computeForInstance (store, computedKey, key, defaultValue) {
   store.compute(computedKey,
diff --git a/src/routes/_store/computations/loggedInComputations.js b/src/routes/_store/computations/loggedInComputations.js
index 03a1f12b..ab3d1d2a 100644
--- a/src/routes/_store/computations/loggedInComputations.js
+++ b/src/routes/_store/computations/loggedInComputations.js
@@ -1,11 +1,11 @@
 // like loggedInObservers.js, these can be lazy-loaded once the user is actually logged in
-import { timelineComputations } from './timelineComputations'
-import { autosuggestComputations } from './autosuggestComputations'
-import { store } from '../store'
-import { wordFilterComputations } from './wordFilterComputations'
-import { badgeComputations } from './badgeComputations'
-import { timelineFilterComputations } from './timelineFilterComputations'
-import { mark, stop } from '../../_utils/marks'
+import { timelineComputations } from './timelineComputations.js'
+import { autosuggestComputations } from './autosuggestComputations.js'
+import { store } from '../store.js'
+import { wordFilterComputations } from './wordFilterComputations.js'
+import { badgeComputations } from './badgeComputations.js'
+import { timelineFilterComputations } from './timelineFilterComputations.js'
+import { mark, stop } from '../../_utils/marks.js'
 
 export function loggedInComputations () {
   mark('loggedInComputations')
diff --git a/src/routes/_store/computations/navComputations.js b/src/routes/_store/computations/navComputations.js
index 30606aef..5f419296 100644
--- a/src/routes/_store/computations/navComputations.js
+++ b/src/routes/_store/computations/navComputations.js
@@ -1,4 +1,4 @@
-import { mark, stop } from '../../_utils/marks'
+import { mark, stop } from '../../_utils/marks.js'
 
 export function navComputations (store) {
   mark('navComputations')
diff --git a/src/routes/_store/computations/timelineComputations.js b/src/routes/_store/computations/timelineComputations.js
index 2330854a..87de0731 100644
--- a/src/routes/_store/computations/timelineComputations.js
+++ b/src/routes/_store/computations/timelineComputations.js
@@ -1,6 +1,6 @@
-import { get } from '../../_utils/lodash-lite'
-import { getFirstIdFromItemSummaries, getLastIdFromItemSummaries } from '../../_utils/getIdFromItemSummaries'
-import { mark, stop } from '../../_utils/marks'
+import { get } from '../../_utils/lodash-lite.js'
+import { getFirstIdFromItemSummaries, getLastIdFromItemSummaries } from '../../_utils/getIdFromItemSummaries.js'
+import { mark, stop } from '../../_utils/marks.js'
 
 function computeForTimeline (store, key, defaultValue) {
   store.compute(key,
diff --git a/src/routes/_store/computations/timelineFilterComputations.js b/src/routes/_store/computations/timelineFilterComputations.js
index 07ba79da..0690543b 100644
--- a/src/routes/_store/computations/timelineFilterComputations.js
+++ b/src/routes/_store/computations/timelineFilterComputations.js
@@ -4,15 +4,15 @@ import {
   NOTIFICATION_FAVORITES,
   NOTIFICATION_FOLLOWS, NOTIFICATION_MENTIONS, NOTIFICATION_POLLS,
   NOTIFICATION_REBLOGS
-} from '../../_static/instanceSettings'
+} from '../../_static/instanceSettings.js'
 import {
   WORD_FILTER_CONTEXT_ACCOUNT,
   WORD_FILTER_CONTEXT_HOME,
   WORD_FILTER_CONTEXT_NOTIFICATIONS,
   WORD_FILTER_CONTEXT_PUBLIC, WORD_FILTER_CONTEXT_THREAD
-} from '../../_static/wordFilters'
-import { createFilterFunction } from '../../_utils/createFilterFunction'
-import { get } from '../../_utils/lodash-lite'
+} from '../../_static/wordFilters.js'
+import { createFilterFunction } from '../../_utils/createFilterFunction.js'
+import { get } from '../../_utils/lodash-lite.js'
 
 // Compute just the boolean, e.g. 'showPolls', so that we can use that boolean as
 // the input to the timelineFilterFunction computations. This should reduce the need to
diff --git a/src/routes/_store/computations/wordFilterComputations.js b/src/routes/_store/computations/wordFilterComputations.js
index a7f5824f..5bb1849d 100644
--- a/src/routes/_store/computations/wordFilterComputations.js
+++ b/src/routes/_store/computations/wordFilterComputations.js
@@ -1,5 +1,5 @@
-import { createRegexFromFilters } from '../../_utils/createRegexFromFilters'
-import { WORD_FILTER_CONTEXTS } from '../../_static/wordFilters'
+import { createRegexFromFilters } from '../../_utils/createRegexFromFilters.js'
+import { WORD_FILTER_CONTEXTS } from '../../_static/wordFilters.js'
 
 export function wordFilterComputations (store) {
   // unexpiredInstanceFilters is calculated based on `now` and `instanceFilters`,
diff --git a/src/routes/_store/loggedInStoreExtensions.js b/src/routes/_store/loggedInStoreExtensions.js
index 166a0fd3..90a9a647 100644
--- a/src/routes/_store/loggedInStoreExtensions.js
+++ b/src/routes/_store/loggedInStoreExtensions.js
@@ -1,6 +1,6 @@
-import { loggedInComputations } from './computations/loggedInComputations'
-import { loggedInObservers } from './observers/loggedInObservers'
-import { loggedInMixins } from './mixins/loggedInMixins'
+import { loggedInComputations } from './computations/loggedInComputations.js'
+import { loggedInObservers } from './observers/loggedInObservers.js'
+import { loggedInMixins } from './mixins/loggedInMixins.js'
 
 console.log('imported logged in observers and computations')
 loggedInMixins()
diff --git a/src/routes/_store/mixins/autosuggestMixins.js b/src/routes/_store/mixins/autosuggestMixins.js
index 6d05177a..1313507e 100644
--- a/src/routes/_store/mixins/autosuggestMixins.js
+++ b/src/routes/_store/mixins/autosuggestMixins.js
@@ -1,4 +1,4 @@
-import { get } from '../../_utils/lodash-lite'
+import { get } from '../../_utils/lodash-lite.js'
 
 export function autosuggestMixins (Store) {
   Store.prototype.setForAutosuggest = function (instanceName, realm, obj) {
diff --git a/src/routes/_store/mixins/composeMixins.js b/src/routes/_store/mixins/composeMixins.js
index 2502c5e6..ec25a6e2 100644
--- a/src/routes/_store/mixins/composeMixins.js
+++ b/src/routes/_store/mixins/composeMixins.js
@@ -1,4 +1,4 @@
-import { get } from '../../_utils/lodash-lite'
+import { get } from '../../_utils/lodash-lite.js'
 
 export function composeMixins (Store) {
   Store.prototype.setComposeData = function (realm, obj) {
diff --git a/src/routes/_store/mixins/instanceMixins.js b/src/routes/_store/mixins/instanceMixins.js
index b6d8a735..85f5aae7 100644
--- a/src/routes/_store/mixins/instanceMixins.js
+++ b/src/routes/_store/mixins/instanceMixins.js
@@ -1,4 +1,4 @@
-import { get } from '../../_utils/lodash-lite'
+import { get } from '../../_utils/lodash-lite.js'
 
 export function instanceMixins (Store) {
   Store.prototype.getInstanceSetting = function (instanceName, settingName, defaultValue) {
diff --git a/src/routes/_store/mixins/loggedInMixins.js b/src/routes/_store/mixins/loggedInMixins.js
index 2dfaf3ac..02467791 100644
--- a/src/routes/_store/mixins/loggedInMixins.js
+++ b/src/routes/_store/mixins/loggedInMixins.js
@@ -1,8 +1,8 @@
-import { timelineMixins } from './timelineMixins'
-import { statusMixins } from './statusMixins'
-import { autosuggestMixins } from './autosuggestMixins'
-import { composeMixins } from './composeMixins'
-import { PinaforeStore as Store } from '../store'
+import { timelineMixins } from './timelineMixins.js'
+import { statusMixins } from './statusMixins.js'
+import { autosuggestMixins } from './autosuggestMixins.js'
+import { composeMixins } from './composeMixins.js'
+import { PinaforeStore as Store } from '../store.js'
 
 export function loggedInMixins () {
   composeMixins(Store)
diff --git a/src/routes/_store/mixins/mixins.js b/src/routes/_store/mixins/mixins.js
index e516a78c..d57eca2c 100644
--- a/src/routes/_store/mixins/mixins.js
+++ b/src/routes/_store/mixins/mixins.js
@@ -1,4 +1,4 @@
-import { instanceMixins } from './instanceMixins'
+import { instanceMixins } from './instanceMixins.js'
 
 export function mixins (Store) {
   instanceMixins(Store)
diff --git a/src/routes/_store/mixins/timelineMixins.js b/src/routes/_store/mixins/timelineMixins.js
index 898fa8f5..9dd2608a 100644
--- a/src/routes/_store/mixins/timelineMixins.js
+++ b/src/routes/_store/mixins/timelineMixins.js
@@ -1,5 +1,5 @@
-import { pickBy, get } from '../../_utils/lodash-lite'
-import { getFirstIdFromItemSummaries } from '../../_utils/getIdFromItemSummaries'
+import { pickBy, get } from '../../_utils/lodash-lite.js'
+import { getFirstIdFromItemSummaries } from '../../_utils/getIdFromItemSummaries.js'
 
 export function timelineMixins (Store) {
   Store.prototype.setForTimeline = function (instanceName, timelineName, obj) {
diff --git a/src/routes/_store/observers/autosuggestObservers.js b/src/routes/_store/observers/autosuggestObservers.js
index 27e31e0f..ad6467e3 100644
--- a/src/routes/_store/observers/autosuggestObservers.js
+++ b/src/routes/_store/observers/autosuggestObservers.js
@@ -1,7 +1,7 @@
-import { store } from '../store'
-import { doEmojiSearch } from '../../_actions/autosuggestEmojiSearch'
-import { doAccountSearch } from '../../_actions/autosuggestAccountSearch'
-import { doHashtagSearch } from '../../_actions/autosuggestHashtagSearch'
+import { store } from '../store.js'
+import { doEmojiSearch } from '../../_actions/autosuggestEmojiSearch.js'
+import { doAccountSearch } from '../../_actions/autosuggestAccountSearch.js'
+import { doHashtagSearch } from '../../_actions/autosuggestHashtagSearch.js'
 
 function resetAutosuggest () {
   store.setForCurrentAutosuggest({
diff --git a/src/routes/_store/observers/badgeObservers.js b/src/routes/_store/observers/badgeObservers.js
index 991e420c..486acd8d 100644
--- a/src/routes/_store/observers/badgeObservers.js
+++ b/src/routes/_store/observers/badgeObservers.js
@@ -1,5 +1,5 @@
-import { store } from '../store'
-import { isChromePre87 } from '../../_utils/userAgent/isChromePre87'
+import { store } from '../store.js'
+import { isChromePre87 } from '../../_utils/userAgent/isChromePre87.js'
 
 export function badgeObservers () {
   if (!process.browser) {
diff --git a/src/routes/_store/observers/cleanup.js b/src/routes/_store/observers/cleanup.js
index f149b6fe..69ee9095 100644
--- a/src/routes/_store/observers/cleanup.js
+++ b/src/routes/_store/observers/cleanup.js
@@ -1,7 +1,7 @@
-import { store } from '../store'
-import { scheduleIdleTask } from '../../_utils/scheduleIdleTask'
-import { CLEANUP_DELAY, CLEANUP_TIME_AGO } from '../../_static/database'
-import { scheduleInterval } from '../../_utils/scheduleInterval'
+import { store } from '../store.js'
+import { scheduleIdleTask } from '../../_utils/scheduleIdleTask.js'
+import { CLEANUP_DELAY, CLEANUP_TIME_AGO } from '../../_static/database.js'
+import { scheduleInterval } from '../../_utils/scheduleInterval.js'
 
 function doCleanup () {
   // Periodically clean up drafts in localStorage, so they don't grow without bound.
diff --git a/src/routes/_store/observers/customEmojiObservers.js b/src/routes/_store/observers/customEmojiObservers.js
index ebf4c2a5..7b6e0223 100644
--- a/src/routes/_store/observers/customEmojiObservers.js
+++ b/src/routes/_store/observers/customEmojiObservers.js
@@ -1,6 +1,6 @@
-import { store } from '../store'
-import * as emojiDatabase from '../../_utils/emojiDatabase'
-import { convertCustomEmojiToEmojiPickerFormat } from '../../_utils/convertCustomEmojiToEmojiPickerFormat'
+import { store } from '../store.js'
+import * as emojiDatabase from '../../_utils/emojiDatabase.js'
+import { convertCustomEmojiToEmojiPickerFormat } from '../../_utils/convertCustomEmojiToEmojiPickerFormat.js'
 
 export function customEmojiObservers () {
   if (!process.browser) {
diff --git a/src/routes/_store/observers/customScrollbarObservers.js b/src/routes/_store/observers/customScrollbarObservers.js
index 056960fb..ac28f0e1 100644
--- a/src/routes/_store/observers/customScrollbarObservers.js
+++ b/src/routes/_store/observers/customScrollbarObservers.js
@@ -1,4 +1,4 @@
-import { store } from '../store'
+import { store } from '../store.js'
 
 const theScrollbarStyle = process.browser && document.getElementById('theScrollbarStyle')
 
diff --git a/src/routes/_store/observers/focusRingObservers.js b/src/routes/_store/observers/focusRingObservers.js
index 8f2ac00f..b641edbb 100644
--- a/src/routes/_store/observers/focusRingObservers.js
+++ b/src/routes/_store/observers/focusRingObservers.js
@@ -1,4 +1,4 @@
-import { supportsFocusVisible } from '../../_utils/supportsFocusVisible'
+import { supportsFocusVisible } from '../../_utils/supportsFocusVisible.js'
 
 export function focusRingObservers (store) {
   if (!process.browser) {
diff --git a/src/routes/_store/observers/grayscaleObservers.js b/src/routes/_store/observers/grayscaleObservers.js
index 69fe794d..abdb484a 100644
--- a/src/routes/_store/observers/grayscaleObservers.js
+++ b/src/routes/_store/observers/grayscaleObservers.js
@@ -1,4 +1,4 @@
-import { switchToTheme } from '../../_utils/themeEngine'
+import { switchToTheme } from '../../_utils/themeEngine.js'
 
 const style = process.browser && document.getElementById('theGrayscaleStyle')
 
diff --git a/src/routes/_store/observers/instanceObservers.js b/src/routes/_store/observers/instanceObservers.js
index 8e0eddc4..64eff25a 100644
--- a/src/routes/_store/observers/instanceObservers.js
+++ b/src/routes/_store/observers/instanceObservers.js
@@ -1,13 +1,13 @@
-import { updateInstanceInfo, updateVerifyCredentialsForInstance } from '../../_actions/instances'
-import { setupListsForInstance } from '../../_actions/lists'
-import { createStream } from '../../_actions/stream/streaming'
-import { updatePushSubscriptionForInstance } from '../../_actions/pushSubscription'
-import { setupCustomEmojiForInstance } from '../../_actions/emoji'
-import { scheduleIdleTask } from '../../_utils/scheduleIdleTask'
-import { mark, stop } from '../../_utils/marks'
-import { store } from '../store'
-import { updateFollowRequestCountIfLockedAccount } from '../../_actions/followRequests'
-import { setupFiltersForInstance } from '../../_actions/filters'
+import { updateInstanceInfo, updateVerifyCredentialsForInstance } from '../../_actions/instances.js'
+import { setupListsForInstance } from '../../_actions/lists.js'
+import { createStream } from '../../_actions/stream/streaming.js'
+import { updatePushSubscriptionForInstance } from '../../_actions/pushSubscription.js'
+import { setupCustomEmojiForInstance } from '../../_actions/emoji.js'
+import { scheduleIdleTask } from '../../_utils/scheduleIdleTask.js'
+import { mark, stop } from '../../_utils/marks.js'
+import { store } from '../store.js'
+import { updateFollowRequestCountIfLockedAccount } from '../../_actions/followRequests.js'
+import { setupFiltersForInstance } from '../../_actions/filters.js'
 
 // stream to watch for home timeline updates and notifications
 let currentInstanceStream
diff --git a/src/routes/_store/observers/logOutObservers.js b/src/routes/_store/observers/logOutObservers.js
index cc0029d6..74a54153 100644
--- a/src/routes/_store/observers/logOutObservers.js
+++ b/src/routes/_store/observers/logOutObservers.js
@@ -1,4 +1,4 @@
-import { onUserIsLoggedOut } from '../../_actions/onUserIsLoggedOut'
+import { onUserIsLoggedOut } from '../../_actions/onUserIsLoggedOut.js'
 
 export function logOutObservers (store) {
   if (!process.browser) {
diff --git a/src/routes/_store/observers/loggedInObservers.js b/src/routes/_store/observers/loggedInObservers.js
index 99de70ba..e18ebc3b 100644
--- a/src/routes/_store/observers/loggedInObservers.js
+++ b/src/routes/_store/observers/loggedInObservers.js
@@ -1,14 +1,14 @@
-import { instanceObservers } from './instanceObservers'
-import { timelineObservers } from './timelineObservers'
-import { notificationObservers } from './notificationObservers'
-import { autosuggestObservers } from './autosuggestObservers'
-import { notificationPermissionObservers } from './notificationPermissionObservers'
-import { customScrollbarObservers } from './customScrollbarObservers'
-import { customEmojiObservers } from './customEmojiObservers'
-import { cleanup } from './cleanup'
-import { wordFilterObservers } from './wordFilterObservers'
-import { showComposeDialogObservers } from './showComposeDialogObservers'
-import { badgeObservers } from './badgeObservers'
+import { instanceObservers } from './instanceObservers.js'
+import { timelineObservers } from './timelineObservers.js'
+import { notificationObservers } from './notificationObservers.js'
+import { autosuggestObservers } from './autosuggestObservers.js'
+import { notificationPermissionObservers } from './notificationPermissionObservers.js'
+import { customScrollbarObservers } from './customScrollbarObservers.js'
+import { customEmojiObservers } from './customEmojiObservers.js'
+import { cleanup } from './cleanup.js'
+import { wordFilterObservers } from './wordFilterObservers.js'
+import { showComposeDialogObservers } from './showComposeDialogObservers.js'
+import { badgeObservers } from './badgeObservers.js'
 
 // These observers can be lazy-loaded when the user is actually logged in.
 // Prevents circular dependencies and reduces the size of main.js
diff --git a/src/routes/_store/observers/navObservers.js b/src/routes/_store/observers/navObservers.js
index 0a835df2..03cc92c6 100644
--- a/src/routes/_store/observers/navObservers.js
+++ b/src/routes/_store/observers/navObservers.js
@@ -1,5 +1,5 @@
-import { emit } from '../../_utils/eventBus'
-import { normalizePageName } from '../../_utils/normalizePageName'
+import { emit } from '../../_utils/eventBus.js'
+import { normalizePageName } from '../../_utils/normalizePageName.js'
 
 export function navObservers (store) {
   function pageIsInNav (store, page) {
diff --git a/src/routes/_store/observers/notificationObservers.js b/src/routes/_store/observers/notificationObservers.js
index 1b70bb6d..c29e9ed5 100644
--- a/src/routes/_store/observers/notificationObservers.js
+++ b/src/routes/_store/observers/notificationObservers.js
@@ -1,6 +1,6 @@
-import { setFavicon } from '../../_utils/setFavicon'
-import { runMediumPriorityTask } from '../../_utils/runMediumPriorityTask'
-import { store } from '../store'
+import { setFavicon } from '../../_utils/setFavicon.js'
+import { runMediumPriorityTask } from '../../_utils/runMediumPriorityTask.js'
+import { store } from '../store.js'
 
 let currentFaviconHasNotifications = false
 
diff --git a/src/routes/_store/observers/notificationPermissionObservers.js b/src/routes/_store/observers/notificationPermissionObservers.js
index 7ad9595a..4e433f8f 100644
--- a/src/routes/_store/observers/notificationPermissionObservers.js
+++ b/src/routes/_store/observers/notificationPermissionObservers.js
@@ -1,4 +1,4 @@
-import { store } from '../store'
+import { store } from '../store.js'
 
 export function notificationPermissionObservers () {
   if (!process.browser || !navigator.permissions || !navigator.permissions.query) {
diff --git a/src/routes/_store/observers/nowObservers.js b/src/routes/_store/observers/nowObservers.js
index 37327e10..02a15769 100644
--- a/src/routes/_store/observers/nowObservers.js
+++ b/src/routes/_store/observers/nowObservers.js
@@ -1,7 +1,7 @@
 // For convenience, periodically re-compute the current time. This ensures freshness of
 // displays like "x minutes ago" without having to jump through a lot of hoops.
-import { scheduleIdleTask } from '../../_utils/scheduleIdleTask'
-import { scheduleInterval } from '../../_utils/scheduleInterval'
+import { scheduleIdleTask } from '../../_utils/scheduleIdleTask.js'
+import { scheduleInterval } from '../../_utils/scheduleInterval.js'
 
 const POLL_INTERVAL = 10000
 
diff --git a/src/routes/_store/observers/observers.js b/src/routes/_store/observers/observers.js
index d904d21e..a251db53 100644
--- a/src/routes/_store/observers/observers.js
+++ b/src/routes/_store/observers/observers.js
@@ -1,14 +1,14 @@
-import { onlineObservers } from './onlineObservers'
-import { nowObservers } from './nowObservers'
-import { navObservers } from './navObservers'
-import { pageVisibilityObservers } from './pageVisibilityObservers'
-import { resizeObservers } from './resizeObservers'
-import { setupLoggedInObservers } from './setupLoggedInObservers'
-import { logOutObservers } from './logOutObservers'
-import { touchObservers } from './touchObservers'
-import { grayscaleObservers } from './grayscaleObservers'
-import { focusRingObservers } from './focusRingObservers'
-import { leftRightFocusObservers } from './leftRightFocusObservers'
+import { onlineObservers } from './onlineObservers.js'
+import { nowObservers } from './nowObservers.js'
+import { navObservers } from './navObservers.js'
+import { pageVisibilityObservers } from './pageVisibilityObservers.js'
+import { resizeObservers } from './resizeObservers.js'
+import { setupLoggedInObservers } from './setupLoggedInObservers.js'
+import { logOutObservers } from './logOutObservers.js'
+import { touchObservers } from './touchObservers.js'
+import { grayscaleObservers } from './grayscaleObservers.js'
+import { focusRingObservers } from './focusRingObservers.js'
+import { leftRightFocusObservers } from './leftRightFocusObservers.js'
 
 export function observers (store) {
   onlineObservers(store)
diff --git a/src/routes/_store/observers/onlineObservers.js b/src/routes/_store/observers/onlineObservers.js
index 5a3d04a6..bcb93e0c 100644
--- a/src/routes/_store/observers/onlineObservers.js
+++ b/src/routes/_store/observers/onlineObservers.js
@@ -1,5 +1,5 @@
-import debounce from 'lodash-es/debounce'
-import { toast } from '../../_components/toast/toast'
+import { debounce } from '../../_thirdparty/lodash/timers.js'
+import { toast } from '../../_components/toast/toast.js'
 
 const OFFLINE_DELAY = 5000
 const NOTIFY_OFFLINE_LIMIT = 1
diff --git a/src/routes/_store/observers/resizeObservers.js b/src/routes/_store/observers/resizeObservers.js
index b54fa470..51ccf737 100644
--- a/src/routes/_store/observers/resizeObservers.js
+++ b/src/routes/_store/observers/resizeObservers.js
@@ -1,4 +1,4 @@
-import { registerResizeListener } from '../../_utils/resize'
+import { registerResizeListener } from '../../_utils/resize.js'
 
 export function resizeObservers (store) {
   if (!process.browser) {
diff --git a/src/routes/_store/observers/showComposeDialogObservers.js b/src/routes/_store/observers/showComposeDialogObservers.js
index 2287ca2c..373a4713 100644
--- a/src/routes/_store/observers/showComposeDialogObservers.js
+++ b/src/routes/_store/observers/showComposeDialogObservers.js
@@ -1,5 +1,5 @@
-import { store } from '../store'
-import { showComposeDialog } from '../../_actions/showComposeDialog'
+import { store } from '../store.js'
+import { showComposeDialog } from '../../_actions/showComposeDialog.js'
 
 // If the user is logged in, and if the Service Worker handled a POST and set special data
 // in IndexedDB, then we want to handle it on the home page.
diff --git a/src/routes/_store/observers/timelineObservers.js b/src/routes/_store/observers/timelineObservers.js
index 21ca9f92..1dded9fa 100644
--- a/src/routes/_store/observers/timelineObservers.js
+++ b/src/routes/_store/observers/timelineObservers.js
@@ -1,6 +1,6 @@
-import { updateInstanceInfo } from '../../_actions/instances'
-import { createStream } from '../../_actions/stream/streaming'
-import { store } from '../store'
+import { updateInstanceInfo } from '../../_actions/instances.js'
+import { createStream } from '../../_actions/stream/streaming.js'
+import { store } from '../store.js'
 
 export function timelineObservers () {
   // stream to watch for local/federated/etc. updates. home and notification
diff --git a/src/routes/_store/observers/wordFilterObservers.js b/src/routes/_store/observers/wordFilterObservers.js
index d6216e91..9502befd 100644
--- a/src/routes/_store/observers/wordFilterObservers.js
+++ b/src/routes/_store/observers/wordFilterObservers.js
@@ -1,10 +1,10 @@
-import { on } from '../../_utils/eventBus'
-import { updateFiltersForInstance } from '../../_actions/filters'
-import { store } from '../store'
-import { isEqual } from 'lodash-es'
-import { computeFilterContextsForStatusOrNotification } from '../../_utils/computeFilterContextsForStatusOrNotification'
-import { database } from '../../_database/database'
-import { mark, stop } from '../../_utils/marks'
+import { on } from '../../_utils/eventBus.js'
+import { updateFiltersForInstance } from '../../_actions/filters.js'
+import { store } from '../store.js'
+import { isEqual } from '../../_thirdparty/lodash/objects.js'
+import { computeFilterContextsForStatusOrNotification } from '../../_utils/computeFilterContextsForStatusOrNotification.js'
+import { database } from '../../_database/database.js'
+import { mark, stop } from '../../_utils/marks.js'
 
 export function wordFilterObservers () {
   if (!process.browser) {
diff --git a/src/routes/_store/store.js b/src/routes/_store/store.js
index de80acfd..a0217709 100644
--- a/src/routes/_store/store.js
+++ b/src/routes/_store/store.js
@@ -1,9 +1,9 @@
-import { observers } from './observers/observers'
-import { computations } from './computations/computations'
-import { mixins } from './mixins/mixins'
-import { LocalStorageStore } from './LocalStorageStore'
+import { observers } from './observers/observers.js'
+import { computations } from './computations/computations.js'
+import { mixins } from './mixins/mixins.js'
+import { LocalStorageStore } from './LocalStorageStore.js'
 import { observe } from 'svelte-extras'
-import { isKaiOS } from '../_utils/userAgent/isKaiOS'
+import { isKaiOS } from '../_utils/userAgent/isKaiOS.js'
 
 const persistedState = {
   alwaysShowFocusRing: false,
diff --git a/src/routes/_store/storeLite.js b/src/routes/_store/storeLite.js
index cb3c223c..e242e1df 100644
--- a/src/routes/_store/storeLite.js
+++ b/src/routes/_store/storeLite.js
@@ -1,7 +1,7 @@
 // "lite" version of the store used in the inline script.
 
-import { safeParse } from '../_utils/safeParse'
-import { testHasLocalStorage } from '../_utils/testStorage'
+import { safeParse } from '../_utils/safeParse.js'
+import { testHasLocalStorage } from '../_utils/testStorage.js'
 
 const hasLocalStorage = testHasLocalStorage()
 
diff --git a/src/routes/_thirdparty/autosize/autosize.js b/src/routes/_thirdparty/autosize/autosize.js
index 52c80213..ed158704 100644
--- a/src/routes/_thirdparty/autosize/autosize.js
+++ b/src/routes/_thirdparty/autosize/autosize.js
@@ -3,10 +3,10 @@
 // remove parent overflow checks, make page resizes more performant,
 // add deferredUpdate, and add perf marks.
 
-import { mark, stop } from '../../_utils/marks'
-import debounce from 'lodash-es/debounce'
-import { getScrollContainer } from '../../_utils/scrollContainer'
-import { throttleTimer } from '../../_utils/throttleTimer'
+import { mark, stop } from '../../_utils/marks.js'
+import { debounce } from '../../_thirdparty/lodash/timers.js'
+import { getScrollContainer } from '../../_utils/scrollContainer.js'
+import { throttleTimer } from '../../_utils/throttleTimer.js'
 
 const doUpdate = process.browser && throttleTimer(requestAnimationFrame)
 
diff --git a/src/routes/_thirdparty/idb-keyval/idb-keyval.js b/src/routes/_thirdparty/idb-keyval/idb-keyval.js
index ab6e088e..aacf3437 100644
--- a/src/routes/_thirdparty/idb-keyval/idb-keyval.js
+++ b/src/routes/_thirdparty/idb-keyval/idb-keyval.js
@@ -1,7 +1,7 @@
 // Forked from https://github.com/jakearchibald/idb-keyval/commit/ea7d507
 // Adds a function for closing the database, ala https://github.com/jakearchibald/idb-keyval/pull/65
 // Also hooks it into the lifecycle frozen event
-import { lifecycle } from '../../_utils/lifecycle'
+import { lifecycle } from '../../_utils/lifecycle.js'
 
 class Store {
   constructor (dbName = 'keyval-store', storeName = 'keyval') {
diff --git a/src/routes/_thirdparty/lodash/LICENSE b/src/routes/_thirdparty/lodash/LICENSE
new file mode 100644
index 00000000..4773fd8e
--- /dev/null
+++ b/src/routes/_thirdparty/lodash/LICENSE
@@ -0,0 +1,49 @@
+The MIT License
+
+Copyright JS Foundation and other contributors <https://js.foundation/>
+
+Based on Underscore.js, copyright Jeremy Ashkenas,
+DocumentCloud and Investigative Reporters & Editors <http://underscorejs.org/>
+
+This software consists of voluntary contributions made by many
+individuals. For exact contribution history, see the revision history
+available at https://github.com/lodash/lodash
+
+The following license applies to all parts of this software except as
+documented below:
+
+====
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+====
+
+Copyright and related rights for sample code are waived via CC0. Sample
+code is defined as all source code displayed within the prose of the
+documentation.
+
+CC0: http://creativecommons.org/publicdomain/zero/1.0/
+
+====
+
+Files located in the node_modules and vendor directories are externally
+maintained libraries used by this software which have their own
+licenses; we recommend you read them, as their terms may differ from the
+terms above.
diff --git a/src/routes/_thirdparty/lodash/objects.js b/src/routes/_thirdparty/lodash/objects.js
new file mode 100644
index 00000000..3a14a8a0
--- /dev/null
+++ b/src/routes/_thirdparty/lodash/objects.js
@@ -0,0 +1,3448 @@
+/* eslint-disable */
+/** Detect free variable `global` from Node.js. */
+var freeGlobal = typeof global == 'object' && global && global.Object === Object && global;
+
+/* eslint-disable */
+
+/** Detect free variable `self`. */
+var freeSelf = typeof self == 'object' && self && self.Object === Object && self;
+
+/** Used as a reference to the global object. */
+var root = freeGlobal || freeSelf || Function('return this')();
+
+/* eslint-disable */
+
+/** Built-in value references. */
+var Symbol = root.Symbol;
+
+/* eslint-disable */
+
+/** Used for built-in method references. */
+var objectProto$b = Object.prototype;
+
+/** Used to check objects for own properties. */
+var hasOwnProperty$8 = objectProto$b.hasOwnProperty;
+
+/**
+ * Used to resolve the
+ * [`toStringTag`](http://ecma-international.org/ecma-262/7.0/#sec-object.prototype.tostring)
+ * of values.
+ */
+var nativeObjectToString$1 = objectProto$b.toString;
+
+/** Built-in value references. */
+var symToStringTag$1 = Symbol ? Symbol.toStringTag : undefined;
+
+/**
+ * A specialized version of `baseGetTag` which ignores `Symbol.toStringTag` values.
+ *
+ * @private
+ * @param {*} value The value to query.
+ * @returns {string} Returns the raw `toStringTag`.
+ */
+function getRawTag(value) {
+  var isOwn = hasOwnProperty$8.call(value, symToStringTag$1),
+      tag = value[symToStringTag$1];
+
+  try {
+    value[symToStringTag$1] = undefined;
+    var unmasked = true;
+  } catch (e) {}
+
+  var result = nativeObjectToString$1.call(value);
+  if (unmasked) {
+    if (isOwn) {
+      value[symToStringTag$1] = tag;
+    } else {
+      delete value[symToStringTag$1];
+    }
+  }
+  return result;
+}
+
+/* eslint-disable */
+/** Used for built-in method references. */
+var objectProto$a = Object.prototype;
+
+/**
+ * Used to resolve the
+ * [`toStringTag`](http://ecma-international.org/ecma-262/7.0/#sec-object.prototype.tostring)
+ * of values.
+ */
+var nativeObjectToString = objectProto$a.toString;
+
+/**
+ * Converts `value` to a string using `Object.prototype.toString`.
+ *
+ * @private
+ * @param {*} value The value to convert.
+ * @returns {string} Returns the converted string.
+ */
+function objectToString(value) {
+  return nativeObjectToString.call(value);
+}
+
+/* eslint-disable */
+
+/** `Object#toString` result references. */
+var nullTag = '[object Null]',
+    undefinedTag = '[object Undefined]';
+
+/** Built-in value references. */
+var symToStringTag = Symbol ? Symbol.toStringTag : undefined;
+
+/**
+ * The base implementation of `getTag` without fallbacks for buggy environments.
+ *
+ * @private
+ * @param {*} value The value to query.
+ * @returns {string} Returns the `toStringTag`.
+ */
+function baseGetTag(value) {
+  if (value == null) {
+    return value === undefined ? undefinedTag : nullTag;
+  }
+  return (symToStringTag && symToStringTag in Object(value))
+    ? getRawTag(value)
+    : objectToString(value);
+}
+
+/* eslint-disable */
+/**
+ * Checks if `value` is object-like. A value is object-like if it's not `null`
+ * and has a `typeof` result of "object".
+ *
+ * @static
+ * @memberOf _
+ * @since 4.0.0
+ * @category Lang
+ * @param {*} value The value to check.
+ * @returns {boolean} Returns `true` if `value` is object-like, else `false`.
+ * @example
+ *
+ * _.isObjectLike({});
+ * // => true
+ *
+ * _.isObjectLike([1, 2, 3]);
+ * // => true
+ *
+ * _.isObjectLike(_.noop);
+ * // => false
+ *
+ * _.isObjectLike(null);
+ * // => false
+ */
+function isObjectLike(value) {
+  return value != null && typeof value == 'object';
+}
+
+/* eslint-disable */
+
+/** `Object#toString` result references. */
+var symbolTag$1 = '[object Symbol]';
+
+/**
+ * Checks if `value` is classified as a `Symbol` primitive or object.
+ *
+ * @static
+ * @memberOf _
+ * @since 4.0.0
+ * @category Lang
+ * @param {*} value The value to check.
+ * @returns {boolean} Returns `true` if `value` is a symbol, else `false`.
+ * @example
+ *
+ * _.isSymbol(Symbol.iterator);
+ * // => true
+ *
+ * _.isSymbol('abc');
+ * // => false
+ */
+function isSymbol(value) {
+  return typeof value == 'symbol' ||
+    (isObjectLike(value) && baseGetTag(value) == symbolTag$1);
+}
+
+/* eslint-disable */
+/**
+ * A specialized version of `_.map` for arrays without support for iteratee
+ * shorthands.
+ *
+ * @private
+ * @param {Array} [array] The array to iterate over.
+ * @param {Function} iteratee The function invoked per iteration.
+ * @returns {Array} Returns the new mapped array.
+ */
+function arrayMap(array, iteratee) {
+  var index = -1,
+      length = array == null ? 0 : array.length,
+      result = Array(length);
+
+  while (++index < length) {
+    result[index] = iteratee(array[index], index, array);
+  }
+  return result;
+}
+
+/* eslint-disable */
+/**
+ * Checks if `value` is classified as an `Array` object.
+ *
+ * @static
+ * @memberOf _
+ * @since 0.1.0
+ * @category Lang
+ * @param {*} value The value to check.
+ * @returns {boolean} Returns `true` if `value` is an array, else `false`.
+ * @example
+ *
+ * _.isArray([1, 2, 3]);
+ * // => true
+ *
+ * _.isArray(document.body.children);
+ * // => false
+ *
+ * _.isArray('abc');
+ * // => false
+ *
+ * _.isArray(_.noop);
+ * // => false
+ */
+var isArray = Array.isArray;
+
+/* eslint-disable */
+
+/** Used as references for various `Number` constants. */
+var INFINITY$2 = 1 / 0;
+
+/** Used to convert symbols to primitives and strings. */
+var symbolProto$1 = Symbol ? Symbol.prototype : undefined,
+    symbolToString = symbolProto$1 ? symbolProto$1.toString : undefined;
+
+/**
+ * The base implementation of `_.toString` which doesn't convert nullish
+ * values to empty strings.
+ *
+ * @private
+ * @param {*} value The value to process.
+ * @returns {string} Returns the string.
+ */
+function baseToString(value) {
+  // Exit early for strings to avoid a performance hit in some environments.
+  if (typeof value == 'string') {
+    return value;
+  }
+  if (isArray(value)) {
+    // Recursively convert values (susceptible to call stack limits).
+    return arrayMap(value, baseToString) + '';
+  }
+  if (isSymbol(value)) {
+    return symbolToString ? symbolToString.call(value) : '';
+  }
+  var result = (value + '');
+  return (result == '0' && (1 / value) == -INFINITY$2) ? '-0' : result;
+}
+
+/* eslint-disable */
+/**
+ * Checks if `value` is the
+ * [language type](http://www.ecma-international.org/ecma-262/7.0/#sec-ecmascript-language-types)
+ * of `Object`. (e.g. arrays, functions, objects, regexes, `new Number(0)`, and `new String('')`)
+ *
+ * @static
+ * @memberOf _
+ * @since 0.1.0
+ * @category Lang
+ * @param {*} value The value to check.
+ * @returns {boolean} Returns `true` if `value` is an object, else `false`.
+ * @example
+ *
+ * _.isObject({});
+ * // => true
+ *
+ * _.isObject([1, 2, 3]);
+ * // => true
+ *
+ * _.isObject(_.noop);
+ * // => true
+ *
+ * _.isObject(null);
+ * // => false
+ */
+function isObject(value) {
+  var type = typeof value;
+  return value != null && (type == 'object' || type == 'function');
+}
+
+/* eslint-disable */
+/**
+ * This method returns the first argument it receives.
+ *
+ * @static
+ * @since 0.1.0
+ * @memberOf _
+ * @category Util
+ * @param {*} value Any value.
+ * @returns {*} Returns `value`.
+ * @example
+ *
+ * var object = { 'a': 1 };
+ *
+ * console.log(_.identity(object) === object);
+ * // => true
+ */
+function identity(value) {
+  return value;
+}
+
+/* eslint-disable */
+
+/** `Object#toString` result references. */
+var asyncTag = '[object AsyncFunction]',
+    funcTag$1 = '[object Function]',
+    genTag = '[object GeneratorFunction]',
+    proxyTag = '[object Proxy]';
+
+/**
+ * Checks if `value` is classified as a `Function` object.
+ *
+ * @static
+ * @memberOf _
+ * @since 0.1.0
+ * @category Lang
+ * @param {*} value The value to check.
+ * @returns {boolean} Returns `true` if `value` is a function, else `false`.
+ * @example
+ *
+ * _.isFunction(_);
+ * // => true
+ *
+ * _.isFunction(/abc/);
+ * // => false
+ */
+function isFunction(value) {
+  if (!isObject(value)) {
+    return false;
+  }
+  // The use of `Object#toString` avoids issues with the `typeof` operator
+  // in Safari 9 which returns 'object' for typed arrays and other constructors.
+  var tag = baseGetTag(value);
+  return tag == funcTag$1 || tag == genTag || tag == asyncTag || tag == proxyTag;
+}
+
+/* eslint-disable */
+
+/** Used to detect overreaching core-js shims. */
+var coreJsData = root['__core-js_shared__'];
+
+/* eslint-disable */
+
+/** Used to detect methods masquerading as native. */
+var maskSrcKey = (function() {
+  var uid = /[^.]+$/.exec(coreJsData && coreJsData.keys && coreJsData.keys.IE_PROTO || '');
+  return uid ? ('Symbol(src)_1.' + uid) : '';
+}());
+
+/**
+ * Checks if `func` has its source masked.
+ *
+ * @private
+ * @param {Function} func The function to check.
+ * @returns {boolean} Returns `true` if `func` is masked, else `false`.
+ */
+function isMasked(func) {
+  return !!maskSrcKey && (maskSrcKey in func);
+}
+
+/* eslint-disable */
+/** Used for built-in method references. */
+var funcProto$1 = Function.prototype;
+
+/** Used to resolve the decompiled source of functions. */
+var funcToString$1 = funcProto$1.toString;
+
+/**
+ * Converts `func` to its source code.
+ *
+ * @private
+ * @param {Function} func The function to convert.
+ * @returns {string} Returns the source code.
+ */
+function toSource(func) {
+  if (func != null) {
+    try {
+      return funcToString$1.call(func);
+    } catch (e) {}
+    try {
+      return (func + '');
+    } catch (e) {}
+  }
+  return '';
+}
+
+/* eslint-disable */
+
+/**
+ * Used to match `RegExp`
+ * [syntax characters](http://ecma-international.org/ecma-262/7.0/#sec-patterns).
+ */
+var reRegExpChar = /[\\^$.*+?()[\]{}|]/g;
+
+/** Used to detect host constructors (Safari). */
+var reIsHostCtor = /^\[object .+?Constructor\]$/;
+
+/** Used for built-in method references. */
+var funcProto = Function.prototype,
+    objectProto$9 = Object.prototype;
+
+/** Used to resolve the decompiled source of functions. */
+var funcToString = funcProto.toString;
+
+/** Used to check objects for own properties. */
+var hasOwnProperty$7 = objectProto$9.hasOwnProperty;
+
+/** Used to detect if a method is native. */
+var reIsNative = RegExp('^' +
+  funcToString.call(hasOwnProperty$7).replace(reRegExpChar, '\\$&')
+  .replace(/hasOwnProperty|(function).*?(?=\\\()| for .+?(?=\\\])/g, '$1.*?') + '$'
+);
+
+/**
+ * The base implementation of `_.isNative` without bad shim checks.
+ *
+ * @private
+ * @param {*} value The value to check.
+ * @returns {boolean} Returns `true` if `value` is a native function,
+ *  else `false`.
+ */
+function baseIsNative(value) {
+  if (!isObject(value) || isMasked(value)) {
+    return false;
+  }
+  var pattern = isFunction(value) ? reIsNative : reIsHostCtor;
+  return pattern.test(toSource(value));
+}
+
+/* eslint-disable */
+/**
+ * Gets the value at `key` of `object`.
+ *
+ * @private
+ * @param {Object} [object] The object to query.
+ * @param {string} key The key of the property to get.
+ * @returns {*} Returns the property value.
+ */
+function getValue(object, key) {
+  return object == null ? undefined : object[key];
+}
+
+/* eslint-disable */
+
+/**
+ * Gets the native function at `key` of `object`.
+ *
+ * @private
+ * @param {Object} object The object to query.
+ * @param {string} key The key of the method to get.
+ * @returns {*} Returns the function if it's native, else `undefined`.
+ */
+function getNative(object, key) {
+  var value = getValue(object, key);
+  return baseIsNative(value) ? value : undefined;
+}
+
+/* eslint-disable */
+
+/* Built-in method references that are verified to be native. */
+var WeakMap = getNative(root, 'WeakMap');
+
+/* eslint-disable */
+/**
+ * A faster alternative to `Function#apply`, this function invokes `func`
+ * with the `this` binding of `thisArg` and the arguments of `args`.
+ *
+ * @private
+ * @param {Function} func The function to invoke.
+ * @param {*} thisArg The `this` binding of `func`.
+ * @param {Array} args The arguments to invoke `func` with.
+ * @returns {*} Returns the result of `func`.
+ */
+function apply(func, thisArg, args) {
+  switch (args.length) {
+    case 0: return func.call(thisArg);
+    case 1: return func.call(thisArg, args[0]);
+    case 2: return func.call(thisArg, args[0], args[1]);
+    case 3: return func.call(thisArg, args[0], args[1], args[2]);
+  }
+  return func.apply(thisArg, args);
+}
+
+/* eslint-disable */
+/**
+ * This method returns `undefined`.
+ *
+ * @static
+ * @memberOf _
+ * @since 2.3.0
+ * @category Util
+ * @example
+ *
+ * _.times(2, _.noop);
+ * // => [undefined, undefined]
+ */
+function noop() {
+  // No operation performed.
+}
+
+/* eslint-disable */
+/** Used to detect hot functions by number of calls within a span of milliseconds. */
+var HOT_COUNT = 800,
+    HOT_SPAN = 16;
+
+/* Built-in method references for those with the same name as other `lodash` methods. */
+var nativeNow = Date.now;
+
+/**
+ * Creates a function that'll short out and invoke `identity` instead
+ * of `func` when it's called `HOT_COUNT` or more times in `HOT_SPAN`
+ * milliseconds.
+ *
+ * @private
+ * @param {Function} func The function to restrict.
+ * @returns {Function} Returns the new shortable function.
+ */
+function shortOut(func) {
+  var count = 0,
+      lastCalled = 0;
+
+  return function() {
+    var stamp = nativeNow(),
+        remaining = HOT_SPAN - (stamp - lastCalled);
+
+    lastCalled = stamp;
+    if (remaining > 0) {
+      if (++count >= HOT_COUNT) {
+        return arguments[0];
+      }
+    } else {
+      count = 0;
+    }
+    return func.apply(undefined, arguments);
+  };
+}
+
+/* eslint-disable */
+/**
+ * Creates a function that returns `value`.
+ *
+ * @static
+ * @memberOf _
+ * @since 2.4.0
+ * @category Util
+ * @param {*} value The value to return from the new function.
+ * @returns {Function} Returns the new constant function.
+ * @example
+ *
+ * var objects = _.times(2, _.constant({ 'a': 1 }));
+ *
+ * console.log(objects);
+ * // => [{ 'a': 1 }, { 'a': 1 }]
+ *
+ * console.log(objects[0] === objects[1]);
+ * // => true
+ */
+function constant(value) {
+  return function() {
+    return value;
+  };
+}
+
+/* eslint-disable */
+
+var defineProperty = (function() {
+  try {
+    var func = getNative(Object, 'defineProperty');
+    func({}, '', {});
+    return func;
+  } catch (e) {}
+}());
+
+/* eslint-disable */
+
+/**
+ * The base implementation of `setToString` without support for hot loop shorting.
+ *
+ * @private
+ * @param {Function} func The function to modify.
+ * @param {Function} string The `toString` result.
+ * @returns {Function} Returns `func`.
+ */
+var baseSetToString = !defineProperty ? identity : function(func, string) {
+  return defineProperty(func, 'toString', {
+    'configurable': true,
+    'enumerable': false,
+    'value': constant(string),
+    'writable': true
+  });
+};
+
+/* eslint-disable */
+
+/**
+ * Sets the `toString` method of `func` to return `string`.
+ *
+ * @private
+ * @param {Function} func The function to modify.
+ * @param {Function} string The `toString` result.
+ * @returns {Function} Returns `func`.
+ */
+var setToString = shortOut(baseSetToString);
+
+/* eslint-disable */
+/**
+ * The base implementation of `_.findIndex` and `_.findLastIndex` without
+ * support for iteratee shorthands.
+ *
+ * @private
+ * @param {Array} array The array to inspect.
+ * @param {Function} predicate The function invoked per iteration.
+ * @param {number} fromIndex The index to search from.
+ * @param {boolean} [fromRight] Specify iterating from right to left.
+ * @returns {number} Returns the index of the matched value, else `-1`.
+ */
+function baseFindIndex(array, predicate, fromIndex, fromRight) {
+  var length = array.length,
+      index = fromIndex + (fromRight ? 1 : -1);
+
+  while ((fromRight ? index-- : ++index < length)) {
+    if (predicate(array[index], index, array)) {
+      return index;
+    }
+  }
+  return -1;
+}
+
+/* eslint-disable */
+/**
+ * The base implementation of `_.isNaN` without support for number objects.
+ *
+ * @private
+ * @param {*} value The value to check.
+ * @returns {boolean} Returns `true` if `value` is `NaN`, else `false`.
+ */
+function baseIsNaN(value) {
+  return value !== value;
+}
+
+/* eslint-disable */
+/**
+ * A specialized version of `_.indexOf` which performs strict equality
+ * comparisons of values, i.e. `===`.
+ *
+ * @private
+ * @param {Array} array The array to inspect.
+ * @param {*} value The value to search for.
+ * @param {number} fromIndex The index to search from.
+ * @returns {number} Returns the index of the matched value, else `-1`.
+ */
+function strictIndexOf(array, value, fromIndex) {
+  var index = fromIndex - 1,
+      length = array.length;
+
+  while (++index < length) {
+    if (array[index] === value) {
+      return index;
+    }
+  }
+  return -1;
+}
+
+/* eslint-disable */
+
+/**
+ * The base implementation of `_.indexOf` without `fromIndex` bounds checks.
+ *
+ * @private
+ * @param {Array} array The array to inspect.
+ * @param {*} value The value to search for.
+ * @param {number} fromIndex The index to search from.
+ * @returns {number} Returns the index of the matched value, else `-1`.
+ */
+function baseIndexOf(array, value, fromIndex) {
+  return value === value
+    ? strictIndexOf(array, value, fromIndex)
+    : baseFindIndex(array, baseIsNaN, fromIndex);
+}
+
+/* eslint-disable */
+
+/**
+ * A specialized version of `_.includes` for arrays without support for
+ * specifying an index to search from.
+ *
+ * @private
+ * @param {Array} [array] The array to inspect.
+ * @param {*} target The value to search for.
+ * @returns {boolean} Returns `true` if `target` is found, else `false`.
+ */
+function arrayIncludes(array, value) {
+  var length = array == null ? 0 : array.length;
+  return !!length && baseIndexOf(array, value, 0) > -1;
+}
+
+/* eslint-disable */
+/** Used as references for various `Number` constants. */
+var MAX_SAFE_INTEGER$1 = 9007199254740991;
+
+/** Used to detect unsigned integer values. */
+var reIsUint = /^(?:0|[1-9]\d*)$/;
+
+/**
+ * Checks if `value` is a valid array-like index.
+ *
+ * @private
+ * @param {*} value The value to check.
+ * @param {number} [length=MAX_SAFE_INTEGER] The upper bounds of a valid index.
+ * @returns {boolean} Returns `true` if `value` is a valid index, else `false`.
+ */
+function isIndex(value, length) {
+  var type = typeof value;
+  length = length == null ? MAX_SAFE_INTEGER$1 : length;
+
+  return !!length &&
+    (type == 'number' ||
+      (type != 'symbol' && reIsUint.test(value))) &&
+        (value > -1 && value % 1 == 0 && value < length);
+}
+
+/* eslint-disable */
+/**
+ * Performs a
+ * [`SameValueZero`](http://ecma-international.org/ecma-262/7.0/#sec-samevaluezero)
+ * comparison between two values to determine if they are equivalent.
+ *
+ * @static
+ * @memberOf _
+ * @since 4.0.0
+ * @category Lang
+ * @param {*} value The value to compare.
+ * @param {*} other The other value to compare.
+ * @returns {boolean} Returns `true` if the values are equivalent, else `false`.
+ * @example
+ *
+ * var object = { 'a': 1 };
+ * var other = { 'a': 1 };
+ *
+ * _.eq(object, object);
+ * // => true
+ *
+ * _.eq(object, other);
+ * // => false
+ *
+ * _.eq('a', 'a');
+ * // => true
+ *
+ * _.eq('a', Object('a'));
+ * // => false
+ *
+ * _.eq(NaN, NaN);
+ * // => true
+ */
+function eq(value, other) {
+  return value === other || (value !== value && other !== other);
+}
+
+/* eslint-disable */
+
+/* Built-in method references for those with the same name as other `lodash` methods. */
+var nativeMax = Math.max;
+
+/**
+ * A specialized version of `baseRest` which transforms the rest array.
+ *
+ * @private
+ * @param {Function} func The function to apply a rest parameter to.
+ * @param {number} [start=func.length-1] The start position of the rest parameter.
+ * @param {Function} transform The rest array transform.
+ * @returns {Function} Returns the new function.
+ */
+function overRest(func, start, transform) {
+  start = nativeMax(start === undefined ? (func.length - 1) : start, 0);
+  return function() {
+    var args = arguments,
+        index = -1,
+        length = nativeMax(args.length - start, 0),
+        array = Array(length);
+
+    while (++index < length) {
+      array[index] = args[start + index];
+    }
+    index = -1;
+    var otherArgs = Array(start + 1);
+    while (++index < start) {
+      otherArgs[index] = args[index];
+    }
+    otherArgs[start] = transform(array);
+    return apply(func, this, otherArgs);
+  };
+}
+
+/* eslint-disable */
+
+/**
+ * The base implementation of `_.rest` which doesn't validate or coerce arguments.
+ *
+ * @private
+ * @param {Function} func The function to apply a rest parameter to.
+ * @param {number} [start=func.length-1] The start position of the rest parameter.
+ * @returns {Function} Returns the new function.
+ */
+function baseRest(func, start) {
+  return setToString(overRest(func, start, identity), func + '');
+}
+
+/* eslint-disable */
+/** Used as references for various `Number` constants. */
+var MAX_SAFE_INTEGER = 9007199254740991;
+
+/**
+ * Checks if `value` is a valid array-like length.
+ *
+ * **Note:** This method is loosely based on
+ * [`ToLength`](http://ecma-international.org/ecma-262/7.0/#sec-tolength).
+ *
+ * @static
+ * @memberOf _
+ * @since 4.0.0
+ * @category Lang
+ * @param {*} value The value to check.
+ * @returns {boolean} Returns `true` if `value` is a valid length, else `false`.
+ * @example
+ *
+ * _.isLength(3);
+ * // => true
+ *
+ * _.isLength(Number.MIN_VALUE);
+ * // => false
+ *
+ * _.isLength(Infinity);
+ * // => false
+ *
+ * _.isLength('3');
+ * // => false
+ */
+function isLength(value) {
+  return typeof value == 'number' &&
+    value > -1 && value % 1 == 0 && value <= MAX_SAFE_INTEGER;
+}
+
+/* eslint-disable */
+
+/**
+ * Checks if `value` is array-like. A value is considered array-like if it's
+ * not a function and has a `value.length` that's an integer greater than or
+ * equal to `0` and less than or equal to `Number.MAX_SAFE_INTEGER`.
+ *
+ * @static
+ * @memberOf _
+ * @since 4.0.0
+ * @category Lang
+ * @param {*} value The value to check.
+ * @returns {boolean} Returns `true` if `value` is array-like, else `false`.
+ * @example
+ *
+ * _.isArrayLike([1, 2, 3]);
+ * // => true
+ *
+ * _.isArrayLike(document.body.children);
+ * // => true
+ *
+ * _.isArrayLike('abc');
+ * // => true
+ *
+ * _.isArrayLike(_.noop);
+ * // => false
+ */
+function isArrayLike(value) {
+  return value != null && isLength(value.length) && !isFunction(value);
+}
+
+/* eslint-disable */
+/** Used for built-in method references. */
+var objectProto$8 = Object.prototype;
+
+/**
+ * Checks if `value` is likely a prototype object.
+ *
+ * @private
+ * @param {*} value The value to check.
+ * @returns {boolean} Returns `true` if `value` is a prototype, else `false`.
+ */
+function isPrototype(value) {
+  var Ctor = value && value.constructor,
+      proto = (typeof Ctor == 'function' && Ctor.prototype) || objectProto$8;
+
+  return value === proto;
+}
+
+/* eslint-disable */
+/**
+ * The base implementation of `_.times` without support for iteratee shorthands
+ * or max array length checks.
+ *
+ * @private
+ * @param {number} n The number of times to invoke `iteratee`.
+ * @param {Function} iteratee The function invoked per iteration.
+ * @returns {Array} Returns the array of results.
+ */
+function baseTimes(n, iteratee) {
+  var index = -1,
+      result = Array(n);
+
+  while (++index < n) {
+    result[index] = iteratee(index);
+  }
+  return result;
+}
+
+/* eslint-disable */
+
+/** `Object#toString` result references. */
+var argsTag$2 = '[object Arguments]';
+
+/**
+ * The base implementation of `_.isArguments`.
+ *
+ * @private
+ * @param {*} value The value to check.
+ * @returns {boolean} Returns `true` if `value` is an `arguments` object,
+ */
+function baseIsArguments(value) {
+  return isObjectLike(value) && baseGetTag(value) == argsTag$2;
+}
+
+/* eslint-disable */
+
+/** Used for built-in method references. */
+var objectProto$7 = Object.prototype;
+
+/** Used to check objects for own properties. */
+var hasOwnProperty$6 = objectProto$7.hasOwnProperty;
+
+/** Built-in value references. */
+var propertyIsEnumerable$1 = objectProto$7.propertyIsEnumerable;
+
+/**
+ * Checks if `value` is likely an `arguments` object.
+ *
+ * @static
+ * @memberOf _
+ * @since 0.1.0
+ * @category Lang
+ * @param {*} value The value to check.
+ * @returns {boolean} Returns `true` if `value` is an `arguments` object,
+ *  else `false`.
+ * @example
+ *
+ * _.isArguments(function() { return arguments; }());
+ * // => true
+ *
+ * _.isArguments([1, 2, 3]);
+ * // => false
+ */
+var isArguments = baseIsArguments(function() { return arguments; }()) ? baseIsArguments : function(value) {
+  return isObjectLike(value) && hasOwnProperty$6.call(value, 'callee') &&
+    !propertyIsEnumerable$1.call(value, 'callee');
+};
+
+/* eslint-disable */
+/**
+ * This method returns `false`.
+ *
+ * @static
+ * @memberOf _
+ * @since 4.13.0
+ * @category Util
+ * @returns {boolean} Returns `false`.
+ * @example
+ *
+ * _.times(2, _.stubFalse);
+ * // => [false, false]
+ */
+function stubFalse() {
+  return false;
+}
+
+/* eslint-disable */
+
+/** Detect free variable `exports`. */
+var freeExports$1 = typeof exports == 'object' && exports && !exports.nodeType && exports;
+
+/** Detect free variable `module`. */
+var freeModule$1 = freeExports$1 && typeof module == 'object' && module && !module.nodeType && module;
+
+/** Detect the popular CommonJS extension `module.exports`. */
+var moduleExports$1 = freeModule$1 && freeModule$1.exports === freeExports$1;
+
+/** Built-in value references. */
+var Buffer = moduleExports$1 ? root.Buffer : undefined;
+
+/* Built-in method references for those with the same name as other `lodash` methods. */
+var nativeIsBuffer = Buffer ? Buffer.isBuffer : undefined;
+
+/**
+ * Checks if `value` is a buffer.
+ *
+ * @static
+ * @memberOf _
+ * @since 4.3.0
+ * @category Lang
+ * @param {*} value The value to check.
+ * @returns {boolean} Returns `true` if `value` is a buffer, else `false`.
+ * @example
+ *
+ * _.isBuffer(new Buffer(2));
+ * // => true
+ *
+ * _.isBuffer(new Uint8Array(2));
+ * // => false
+ */
+var isBuffer = nativeIsBuffer || stubFalse;
+
+/* eslint-disable */
+
+/** `Object#toString` result references. */
+var argsTag$1 = '[object Arguments]',
+    arrayTag$1 = '[object Array]',
+    boolTag$1 = '[object Boolean]',
+    dateTag$1 = '[object Date]',
+    errorTag$1 = '[object Error]',
+    funcTag = '[object Function]',
+    mapTag$2 = '[object Map]',
+    numberTag$1 = '[object Number]',
+    objectTag$2 = '[object Object]',
+    regexpTag$1 = '[object RegExp]',
+    setTag$2 = '[object Set]',
+    stringTag$1 = '[object String]',
+    weakMapTag$1 = '[object WeakMap]';
+
+var arrayBufferTag$1 = '[object ArrayBuffer]',
+    dataViewTag$2 = '[object DataView]',
+    float32Tag = '[object Float32Array]',
+    float64Tag = '[object Float64Array]',
+    int8Tag = '[object Int8Array]',
+    int16Tag = '[object Int16Array]',
+    int32Tag = '[object Int32Array]',
+    uint8Tag = '[object Uint8Array]',
+    uint8ClampedTag = '[object Uint8ClampedArray]',
+    uint16Tag = '[object Uint16Array]',
+    uint32Tag = '[object Uint32Array]';
+
+/** Used to identify `toStringTag` values of typed arrays. */
+var typedArrayTags = {};
+typedArrayTags[float32Tag] = typedArrayTags[float64Tag] =
+typedArrayTags[int8Tag] = typedArrayTags[int16Tag] =
+typedArrayTags[int32Tag] = typedArrayTags[uint8Tag] =
+typedArrayTags[uint8ClampedTag] = typedArrayTags[uint16Tag] =
+typedArrayTags[uint32Tag] = true;
+typedArrayTags[argsTag$1] = typedArrayTags[arrayTag$1] =
+typedArrayTags[arrayBufferTag$1] = typedArrayTags[boolTag$1] =
+typedArrayTags[dataViewTag$2] = typedArrayTags[dateTag$1] =
+typedArrayTags[errorTag$1] = typedArrayTags[funcTag] =
+typedArrayTags[mapTag$2] = typedArrayTags[numberTag$1] =
+typedArrayTags[objectTag$2] = typedArrayTags[regexpTag$1] =
+typedArrayTags[setTag$2] = typedArrayTags[stringTag$1] =
+typedArrayTags[weakMapTag$1] = false;
+
+/**
+ * The base implementation of `_.isTypedArray` without Node.js optimizations.
+ *
+ * @private
+ * @param {*} value The value to check.
+ * @returns {boolean} Returns `true` if `value` is a typed array, else `false`.
+ */
+function baseIsTypedArray(value) {
+  return isObjectLike(value) &&
+    isLength(value.length) && !!typedArrayTags[baseGetTag(value)];
+}
+
+/* eslint-disable */
+/**
+ * The base implementation of `_.unary` without support for storing metadata.
+ *
+ * @private
+ * @param {Function} func The function to cap arguments for.
+ * @returns {Function} Returns the new capped function.
+ */
+function baseUnary(func) {
+  return function(value) {
+    return func(value);
+  };
+}
+
+/* eslint-disable */
+
+/** Detect free variable `exports`. */
+var freeExports = typeof exports == 'object' && exports && !exports.nodeType && exports;
+
+/** Detect free variable `module`. */
+var freeModule = freeExports && typeof module == 'object' && module && !module.nodeType && module;
+
+/** Detect the popular CommonJS extension `module.exports`. */
+var moduleExports = freeModule && freeModule.exports === freeExports;
+
+/** Detect free variable `process` from Node.js. */
+var freeProcess = moduleExports && freeGlobal.process;
+
+/** Used to access faster Node.js helpers. */
+var nodeUtil = (function() {
+  try {
+    // Use `util.types` for Node.js 10+.
+    var types = freeModule && freeModule.require && freeModule.require('util').types;
+
+    if (types) {
+      return types;
+    }
+
+    // Legacy `process.binding('util')` for Node.js < 10.
+    return freeProcess && freeProcess.binding && freeProcess.binding('util');
+  } catch (e) {}
+}());
+
+/* eslint-disable */
+
+/* Node.js helper references. */
+var nodeIsTypedArray = nodeUtil && nodeUtil.isTypedArray;
+
+/**
+ * Checks if `value` is classified as a typed array.
+ *
+ * @static
+ * @memberOf _
+ * @since 3.0.0
+ * @category Lang
+ * @param {*} value The value to check.
+ * @returns {boolean} Returns `true` if `value` is a typed array, else `false`.
+ * @example
+ *
+ * _.isTypedArray(new Uint8Array);
+ * // => true
+ *
+ * _.isTypedArray([]);
+ * // => false
+ */
+var isTypedArray = nodeIsTypedArray ? baseUnary(nodeIsTypedArray) : baseIsTypedArray;
+
+/* eslint-disable */
+
+/** Used for built-in method references. */
+var objectProto$6 = Object.prototype;
+
+/** Used to check objects for own properties. */
+var hasOwnProperty$5 = objectProto$6.hasOwnProperty;
+
+/**
+ * Creates an array of the enumerable property names of the array-like `value`.
+ *
+ * @private
+ * @param {*} value The value to query.
+ * @param {boolean} inherited Specify returning inherited property names.
+ * @returns {Array} Returns the array of property names.
+ */
+function arrayLikeKeys(value, inherited) {
+  var isArr = isArray(value),
+      isArg = !isArr && isArguments(value),
+      isBuff = !isArr && !isArg && isBuffer(value),
+      isType = !isArr && !isArg && !isBuff && isTypedArray(value),
+      skipIndexes = isArr || isArg || isBuff || isType,
+      result = skipIndexes ? baseTimes(value.length, String) : [],
+      length = result.length;
+
+  for (var key in value) {
+    if ((inherited || hasOwnProperty$5.call(value, key)) &&
+        !(skipIndexes && (
+           // Safari 9 has enumerable `arguments.length` in strict mode.
+           key == 'length' ||
+           // Node.js 0.10 has enumerable non-index properties on buffers.
+           (isBuff && (key == 'offset' || key == 'parent')) ||
+           // PhantomJS 2 has enumerable non-index properties on typed arrays.
+           (isType && (key == 'buffer' || key == 'byteLength' || key == 'byteOffset')) ||
+           // Skip index properties.
+           isIndex(key, length)
+        ))) {
+      result.push(key);
+    }
+  }
+  return result;
+}
+
+/* eslint-disable */
+/**
+ * Creates a unary function that invokes `func` with its argument transformed.
+ *
+ * @private
+ * @param {Function} func The function to wrap.
+ * @param {Function} transform The argument transform.
+ * @returns {Function} Returns the new function.
+ */
+function overArg(func, transform) {
+  return function(arg) {
+    return func(transform(arg));
+  };
+}
+
+/* eslint-disable */
+
+/* Built-in method references for those with the same name as other `lodash` methods. */
+var nativeKeys = overArg(Object.keys, Object);
+
+/* eslint-disable */
+
+/** Used for built-in method references. */
+var objectProto$5 = Object.prototype;
+
+/** Used to check objects for own properties. */
+var hasOwnProperty$4 = objectProto$5.hasOwnProperty;
+
+/**
+ * The base implementation of `_.keys` which doesn't treat sparse arrays as dense.
+ *
+ * @private
+ * @param {Object} object The object to query.
+ * @returns {Array} Returns the array of property names.
+ */
+function baseKeys(object) {
+  if (!isPrototype(object)) {
+    return nativeKeys(object);
+  }
+  var result = [];
+  for (var key in Object(object)) {
+    if (hasOwnProperty$4.call(object, key) && key != 'constructor') {
+      result.push(key);
+    }
+  }
+  return result;
+}
+
+/* eslint-disable */
+
+/**
+ * Creates an array of the own enumerable property names of `object`.
+ *
+ * **Note:** Non-object values are coerced to objects. See the
+ * [ES spec](http://ecma-international.org/ecma-262/7.0/#sec-object.keys)
+ * for more details.
+ *
+ * @static
+ * @since 0.1.0
+ * @memberOf _
+ * @category Object
+ * @param {Object} object The object to query.
+ * @returns {Array} Returns the array of property names.
+ * @example
+ *
+ * function Foo() {
+ *   this.a = 1;
+ *   this.b = 2;
+ * }
+ *
+ * Foo.prototype.c = 3;
+ *
+ * _.keys(new Foo);
+ * // => ['a', 'b'] (iteration order is not guaranteed)
+ *
+ * _.keys('hi');
+ * // => ['0', '1']
+ */
+function keys(object) {
+  return isArrayLike(object) ? arrayLikeKeys(object) : baseKeys(object);
+}
+
+/* eslint-disable */
+
+/** Used to match property names within property paths. */
+var reIsDeepProp = /\.|\[(?:[^[\]]*|(["'])(?:(?!\1)[^\\]|\\.)*?\1)\]/,
+    reIsPlainProp = /^\w*$/;
+
+/**
+ * Checks if `value` is a property name and not a property path.
+ *
+ * @private
+ * @param {*} value The value to check.
+ * @param {Object} [object] The object to query keys on.
+ * @returns {boolean} Returns `true` if `value` is a property name, else `false`.
+ */
+function isKey(value, object) {
+  if (isArray(value)) {
+    return false;
+  }
+  var type = typeof value;
+  if (type == 'number' || type == 'symbol' || type == 'boolean' ||
+      value == null || isSymbol(value)) {
+    return true;
+  }
+  return reIsPlainProp.test(value) || !reIsDeepProp.test(value) ||
+    (object != null && value in Object(object));
+}
+
+/* eslint-disable */
+
+/* Built-in method references that are verified to be native. */
+var nativeCreate = getNative(Object, 'create');
+
+/* eslint-disable */
+
+/**
+ * Removes all key-value entries from the hash.
+ *
+ * @private
+ * @name clear
+ * @memberOf Hash
+ */
+function hashClear() {
+  this.__data__ = nativeCreate ? nativeCreate(null) : {};
+  this.size = 0;
+}
+
+/* eslint-disable */
+/**
+ * Removes `key` and its value from the hash.
+ *
+ * @private
+ * @name delete
+ * @memberOf Hash
+ * @param {Object} hash The hash to modify.
+ * @param {string} key The key of the value to remove.
+ * @returns {boolean} Returns `true` if the entry was removed, else `false`.
+ */
+function hashDelete(key) {
+  var result = this.has(key) && delete this.__data__[key];
+  this.size -= result ? 1 : 0;
+  return result;
+}
+
+/* eslint-disable */
+
+/** Used to stand-in for `undefined` hash values. */
+var HASH_UNDEFINED$2 = '__lodash_hash_undefined__';
+
+/** Used for built-in method references. */
+var objectProto$4 = Object.prototype;
+
+/** Used to check objects for own properties. */
+var hasOwnProperty$3 = objectProto$4.hasOwnProperty;
+
+/**
+ * Gets the hash value for `key`.
+ *
+ * @private
+ * @name get
+ * @memberOf Hash
+ * @param {string} key The key of the value to get.
+ * @returns {*} Returns the entry value.
+ */
+function hashGet(key) {
+  var data = this.__data__;
+  if (nativeCreate) {
+    var result = data[key];
+    return result === HASH_UNDEFINED$2 ? undefined : result;
+  }
+  return hasOwnProperty$3.call(data, key) ? data[key] : undefined;
+}
+
+/* eslint-disable */
+
+/** Used for built-in method references. */
+var objectProto$3 = Object.prototype;
+
+/** Used to check objects for own properties. */
+var hasOwnProperty$2 = objectProto$3.hasOwnProperty;
+
+/**
+ * Checks if a hash value for `key` exists.
+ *
+ * @private
+ * @name has
+ * @memberOf Hash
+ * @param {string} key The key of the entry to check.
+ * @returns {boolean} Returns `true` if an entry for `key` exists, else `false`.
+ */
+function hashHas(key) {
+  var data = this.__data__;
+  return nativeCreate ? (data[key] !== undefined) : hasOwnProperty$2.call(data, key);
+}
+
+/* eslint-disable */
+
+/** Used to stand-in for `undefined` hash values. */
+var HASH_UNDEFINED$1 = '__lodash_hash_undefined__';
+
+/**
+ * Sets the hash `key` to `value`.
+ *
+ * @private
+ * @name set
+ * @memberOf Hash
+ * @param {string} key The key of the value to set.
+ * @param {*} value The value to set.
+ * @returns {Object} Returns the hash instance.
+ */
+function hashSet(key, value) {
+  var data = this.__data__;
+  this.size += this.has(key) ? 0 : 1;
+  data[key] = (nativeCreate && value === undefined) ? HASH_UNDEFINED$1 : value;
+  return this;
+}
+
+/* eslint-disable */
+
+/**
+ * Creates a hash object.
+ *
+ * @private
+ * @constructor
+ * @param {Array} [entries] The key-value pairs to cache.
+ */
+function Hash(entries) {
+  var index = -1,
+      length = entries == null ? 0 : entries.length;
+
+  this.clear();
+  while (++index < length) {
+    var entry = entries[index];
+    this.set(entry[0], entry[1]);
+  }
+}
+
+// Add methods to `Hash`.
+Hash.prototype.clear = hashClear;
+Hash.prototype['delete'] = hashDelete;
+Hash.prototype.get = hashGet;
+Hash.prototype.has = hashHas;
+Hash.prototype.set = hashSet;
+
+/* eslint-disable */
+/**
+ * Removes all key-value entries from the list cache.
+ *
+ * @private
+ * @name clear
+ * @memberOf ListCache
+ */
+function listCacheClear() {
+  this.__data__ = [];
+  this.size = 0;
+}
+
+/* eslint-disable */
+
+/**
+ * Gets the index at which the `key` is found in `array` of key-value pairs.
+ *
+ * @private
+ * @param {Array} array The array to inspect.
+ * @param {*} key The key to search for.
+ * @returns {number} Returns the index of the matched value, else `-1`.
+ */
+function assocIndexOf(array, key) {
+  var length = array.length;
+  while (length--) {
+    if (eq(array[length][0], key)) {
+      return length;
+    }
+  }
+  return -1;
+}
+
+/* eslint-disable */
+
+/** Used for built-in method references. */
+var arrayProto = Array.prototype;
+
+/** Built-in value references. */
+var splice = arrayProto.splice;
+
+/**
+ * Removes `key` and its value from the list cache.
+ *
+ * @private
+ * @name delete
+ * @memberOf ListCache
+ * @param {string} key The key of the value to remove.
+ * @returns {boolean} Returns `true` if the entry was removed, else `false`.
+ */
+function listCacheDelete(key) {
+  var data = this.__data__,
+      index = assocIndexOf(data, key);
+
+  if (index < 0) {
+    return false;
+  }
+  var lastIndex = data.length - 1;
+  if (index == lastIndex) {
+    data.pop();
+  } else {
+    splice.call(data, index, 1);
+  }
+  --this.size;
+  return true;
+}
+
+/* eslint-disable */
+
+/**
+ * Gets the list cache value for `key`.
+ *
+ * @private
+ * @name get
+ * @memberOf ListCache
+ * @param {string} key The key of the value to get.
+ * @returns {*} Returns the entry value.
+ */
+function listCacheGet(key) {
+  var data = this.__data__,
+      index = assocIndexOf(data, key);
+
+  return index < 0 ? undefined : data[index][1];
+}
+
+/* eslint-disable */
+
+/**
+ * Checks if a list cache value for `key` exists.
+ *
+ * @private
+ * @name has
+ * @memberOf ListCache
+ * @param {string} key The key of the entry to check.
+ * @returns {boolean} Returns `true` if an entry for `key` exists, else `false`.
+ */
+function listCacheHas(key) {
+  return assocIndexOf(this.__data__, key) > -1;
+}
+
+/* eslint-disable */
+
+/**
+ * Sets the list cache `key` to `value`.
+ *
+ * @private
+ * @name set
+ * @memberOf ListCache
+ * @param {string} key The key of the value to set.
+ * @param {*} value The value to set.
+ * @returns {Object} Returns the list cache instance.
+ */
+function listCacheSet(key, value) {
+  var data = this.__data__,
+      index = assocIndexOf(data, key);
+
+  if (index < 0) {
+    ++this.size;
+    data.push([key, value]);
+  } else {
+    data[index][1] = value;
+  }
+  return this;
+}
+
+/* eslint-disable */
+
+/**
+ * Creates an list cache object.
+ *
+ * @private
+ * @constructor
+ * @param {Array} [entries] The key-value pairs to cache.
+ */
+function ListCache(entries) {
+  var index = -1,
+      length = entries == null ? 0 : entries.length;
+
+  this.clear();
+  while (++index < length) {
+    var entry = entries[index];
+    this.set(entry[0], entry[1]);
+  }
+}
+
+// Add methods to `ListCache`.
+ListCache.prototype.clear = listCacheClear;
+ListCache.prototype['delete'] = listCacheDelete;
+ListCache.prototype.get = listCacheGet;
+ListCache.prototype.has = listCacheHas;
+ListCache.prototype.set = listCacheSet;
+
+/* eslint-disable */
+
+/* Built-in method references that are verified to be native. */
+var Map = getNative(root, 'Map');
+
+/* eslint-disable */
+
+/**
+ * Removes all key-value entries from the map.
+ *
+ * @private
+ * @name clear
+ * @memberOf MapCache
+ */
+function mapCacheClear() {
+  this.size = 0;
+  this.__data__ = {
+    'hash': new Hash,
+    'map': new (Map || ListCache),
+    'string': new Hash
+  };
+}
+
+/* eslint-disable */
+/**
+ * Checks if `value` is suitable for use as unique object key.
+ *
+ * @private
+ * @param {*} value The value to check.
+ * @returns {boolean} Returns `true` if `value` is suitable, else `false`.
+ */
+function isKeyable(value) {
+  var type = typeof value;
+  return (type == 'string' || type == 'number' || type == 'symbol' || type == 'boolean')
+    ? (value !== '__proto__')
+    : (value === null);
+}
+
+/* eslint-disable */
+
+/**
+ * Gets the data for `map`.
+ *
+ * @private
+ * @param {Object} map The map to query.
+ * @param {string} key The reference key.
+ * @returns {*} Returns the map data.
+ */
+function getMapData(map, key) {
+  var data = map.__data__;
+  return isKeyable(key)
+    ? data[typeof key == 'string' ? 'string' : 'hash']
+    : data.map;
+}
+
+/* eslint-disable */
+
+/**
+ * Removes `key` and its value from the map.
+ *
+ * @private
+ * @name delete
+ * @memberOf MapCache
+ * @param {string} key The key of the value to remove.
+ * @returns {boolean} Returns `true` if the entry was removed, else `false`.
+ */
+function mapCacheDelete(key) {
+  var result = getMapData(this, key)['delete'](key);
+  this.size -= result ? 1 : 0;
+  return result;
+}
+
+/* eslint-disable */
+
+/**
+ * Gets the map value for `key`.
+ *
+ * @private
+ * @name get
+ * @memberOf MapCache
+ * @param {string} key The key of the value to get.
+ * @returns {*} Returns the entry value.
+ */
+function mapCacheGet(key) {
+  return getMapData(this, key).get(key);
+}
+
+/* eslint-disable */
+
+/**
+ * Checks if a map value for `key` exists.
+ *
+ * @private
+ * @name has
+ * @memberOf MapCache
+ * @param {string} key The key of the entry to check.
+ * @returns {boolean} Returns `true` if an entry for `key` exists, else `false`.
+ */
+function mapCacheHas(key) {
+  return getMapData(this, key).has(key);
+}
+
+/* eslint-disable */
+
+/**
+ * Sets the map `key` to `value`.
+ *
+ * @private
+ * @name set
+ * @memberOf MapCache
+ * @param {string} key The key of the value to set.
+ * @param {*} value The value to set.
+ * @returns {Object} Returns the map cache instance.
+ */
+function mapCacheSet(key, value) {
+  var data = getMapData(this, key),
+      size = data.size;
+
+  data.set(key, value);
+  this.size += data.size == size ? 0 : 1;
+  return this;
+}
+
+/* eslint-disable */
+
+/**
+ * Creates a map cache object to store key-value pairs.
+ *
+ * @private
+ * @constructor
+ * @param {Array} [entries] The key-value pairs to cache.
+ */
+function MapCache(entries) {
+  var index = -1,
+      length = entries == null ? 0 : entries.length;
+
+  this.clear();
+  while (++index < length) {
+    var entry = entries[index];
+    this.set(entry[0], entry[1]);
+  }
+}
+
+// Add methods to `MapCache`.
+MapCache.prototype.clear = mapCacheClear;
+MapCache.prototype['delete'] = mapCacheDelete;
+MapCache.prototype.get = mapCacheGet;
+MapCache.prototype.has = mapCacheHas;
+MapCache.prototype.set = mapCacheSet;
+
+/* eslint-disable */
+
+/** Error message constants. */
+var FUNC_ERROR_TEXT = 'Expected a function';
+
+/**
+ * Creates a function that memoizes the result of `func`. If `resolver` is
+ * provided, it determines the cache key for storing the result based on the
+ * arguments provided to the memoized function. By default, the first argument
+ * provided to the memoized function is used as the map cache key. The `func`
+ * is invoked with the `this` binding of the memoized function.
+ *
+ * **Note:** The cache is exposed as the `cache` property on the memoized
+ * function. Its creation may be customized by replacing the `_.memoize.Cache`
+ * constructor with one whose instances implement the
+ * [`Map`](http://ecma-international.org/ecma-262/7.0/#sec-properties-of-the-map-prototype-object)
+ * method interface of `clear`, `delete`, `get`, `has`, and `set`.
+ *
+ * @static
+ * @memberOf _
+ * @since 0.1.0
+ * @category Function
+ * @param {Function} func The function to have its output memoized.
+ * @param {Function} [resolver] The function to resolve the cache key.
+ * @returns {Function} Returns the new memoized function.
+ * @example
+ *
+ * var object = { 'a': 1, 'b': 2 };
+ * var other = { 'c': 3, 'd': 4 };
+ *
+ * var values = _.memoize(_.values);
+ * values(object);
+ * // => [1, 2]
+ *
+ * values(other);
+ * // => [3, 4]
+ *
+ * object.a = 2;
+ * values(object);
+ * // => [1, 2]
+ *
+ * // Modify the result cache.
+ * values.cache.set(object, ['a', 'b']);
+ * values(object);
+ * // => ['a', 'b']
+ *
+ * // Replace `_.memoize.Cache`.
+ * _.memoize.Cache = WeakMap;
+ */
+function memoize(func, resolver) {
+  if (typeof func != 'function' || (resolver != null && typeof resolver != 'function')) {
+    throw new TypeError(FUNC_ERROR_TEXT);
+  }
+  var memoized = function() {
+    var args = arguments,
+        key = resolver ? resolver.apply(this, args) : args[0],
+        cache = memoized.cache;
+
+    if (cache.has(key)) {
+      return cache.get(key);
+    }
+    var result = func.apply(this, args);
+    memoized.cache = cache.set(key, result) || cache;
+    return result;
+  };
+  memoized.cache = new (memoize.Cache || MapCache);
+  return memoized;
+}
+
+// Expose `MapCache`.
+memoize.Cache = MapCache;
+
+/* eslint-disable */
+
+/** Used as the maximum memoize cache size. */
+var MAX_MEMOIZE_SIZE = 500;
+
+/**
+ * A specialized version of `_.memoize` which clears the memoized function's
+ * cache when it exceeds `MAX_MEMOIZE_SIZE`.
+ *
+ * @private
+ * @param {Function} func The function to have its output memoized.
+ * @returns {Function} Returns the new memoized function.
+ */
+function memoizeCapped(func) {
+  var result = memoize(func, function(key) {
+    if (cache.size === MAX_MEMOIZE_SIZE) {
+      cache.clear();
+    }
+    return key;
+  });
+
+  var cache = result.cache;
+  return result;
+}
+
+/* eslint-disable */
+
+/** Used to match property names within property paths. */
+var rePropName = /[^.[\]]+|\[(?:(-?\d+(?:\.\d+)?)|(["'])((?:(?!\2)[^\\]|\\.)*?)\2)\]|(?=(?:\.|\[\])(?:\.|\[\]|$))/g;
+
+/** Used to match backslashes in property paths. */
+var reEscapeChar = /\\(\\)?/g;
+
+/**
+ * Converts `string` to a property path array.
+ *
+ * @private
+ * @param {string} string The string to convert.
+ * @returns {Array} Returns the property path array.
+ */
+var stringToPath = memoizeCapped(function(string) {
+  var result = [];
+  if (string.charCodeAt(0) === 46 /* . */) {
+    result.push('');
+  }
+  string.replace(rePropName, function(match, number, quote, subString) {
+    result.push(quote ? subString.replace(reEscapeChar, '$1') : (number || match));
+  });
+  return result;
+});
+
+/* eslint-disable */
+
+/**
+ * Converts `value` to a string. An empty string is returned for `null`
+ * and `undefined` values. The sign of `-0` is preserved.
+ *
+ * @static
+ * @memberOf _
+ * @since 4.0.0
+ * @category Lang
+ * @param {*} value The value to convert.
+ * @returns {string} Returns the converted string.
+ * @example
+ *
+ * _.toString(null);
+ * // => ''
+ *
+ * _.toString(-0);
+ * // => '-0'
+ *
+ * _.toString([1, 2, 3]);
+ * // => '1,2,3'
+ */
+function toString(value) {
+  return value == null ? '' : baseToString(value);
+}
+
+/* eslint-disable */
+
+/**
+ * Casts `value` to a path array if it's not one.
+ *
+ * @private
+ * @param {*} value The value to inspect.
+ * @param {Object} [object] The object to query keys on.
+ * @returns {Array} Returns the cast property path array.
+ */
+function castPath(value, object) {
+  if (isArray(value)) {
+    return value;
+  }
+  return isKey(value, object) ? [value] : stringToPath(toString(value));
+}
+
+/* eslint-disable */
+
+/** Used as references for various `Number` constants. */
+var INFINITY$1 = 1 / 0;
+
+/**
+ * Converts `value` to a string key if it's not a string or symbol.
+ *
+ * @private
+ * @param {*} value The value to inspect.
+ * @returns {string|symbol} Returns the key.
+ */
+function toKey(value) {
+  if (typeof value == 'string' || isSymbol(value)) {
+    return value;
+  }
+  var result = (value + '');
+  return (result == '0' && (1 / value) == -INFINITY$1) ? '-0' : result;
+}
+
+/* eslint-disable */
+
+/**
+ * The base implementation of `_.get` without support for default values.
+ *
+ * @private
+ * @param {Object} object The object to query.
+ * @param {Array|string} path The path of the property to get.
+ * @returns {*} Returns the resolved value.
+ */
+function baseGet(object, path) {
+  path = castPath(path, object);
+
+  var index = 0,
+      length = path.length;
+
+  while (object != null && index < length) {
+    object = object[toKey(path[index++])];
+  }
+  return (index && index == length) ? object : undefined;
+}
+
+/* eslint-disable */
+
+/**
+ * Gets the value at `path` of `object`. If the resolved value is
+ * `undefined`, the `defaultValue` is returned in its place.
+ *
+ * @static
+ * @memberOf _
+ * @since 3.7.0
+ * @category Object
+ * @param {Object} object The object to query.
+ * @param {Array|string} path The path of the property to get.
+ * @param {*} [defaultValue] The value returned for `undefined` resolved values.
+ * @returns {*} Returns the resolved value.
+ * @example
+ *
+ * var object = { 'a': [{ 'b': { 'c': 3 } }] };
+ *
+ * _.get(object, 'a[0].b.c');
+ * // => 3
+ *
+ * _.get(object, ['a', '0', 'b', 'c']);
+ * // => 3
+ *
+ * _.get(object, 'a.b.c', 'default');
+ * // => 'default'
+ */
+function get(object, path, defaultValue) {
+  var result = object == null ? undefined : baseGet(object, path);
+  return result === undefined ? defaultValue : result;
+}
+
+/* eslint-disable */
+/**
+ * Appends the elements of `values` to `array`.
+ *
+ * @private
+ * @param {Array} array The array to modify.
+ * @param {Array} values The values to append.
+ * @returns {Array} Returns `array`.
+ */
+function arrayPush(array, values) {
+  var index = -1,
+      length = values.length,
+      offset = array.length;
+
+  while (++index < length) {
+    array[offset + index] = values[index];
+  }
+  return array;
+}
+
+/* eslint-disable */
+
+/** Built-in value references. */
+var spreadableSymbol = Symbol ? Symbol.isConcatSpreadable : undefined;
+
+/**
+ * Checks if `value` is a flattenable `arguments` object or array.
+ *
+ * @private
+ * @param {*} value The value to check.
+ * @returns {boolean} Returns `true` if `value` is flattenable, else `false`.
+ */
+function isFlattenable(value) {
+  return isArray(value) || isArguments(value) ||
+    !!(spreadableSymbol && value && value[spreadableSymbol]);
+}
+
+/* eslint-disable */
+
+/**
+ * The base implementation of `_.flatten` with support for restricting flattening.
+ *
+ * @private
+ * @param {Array} array The array to flatten.
+ * @param {number} depth The maximum recursion depth.
+ * @param {boolean} [predicate=isFlattenable] The function invoked per iteration.
+ * @param {boolean} [isStrict] Restrict to values that pass `predicate` checks.
+ * @param {Array} [result=[]] The initial result value.
+ * @returns {Array} Returns the new flattened array.
+ */
+function baseFlatten(array, depth, predicate, isStrict, result) {
+  var index = -1,
+      length = array.length;
+
+  predicate || (predicate = isFlattenable);
+  result || (result = []);
+
+  while (++index < length) {
+    var value = array[index];
+    if (depth > 0 && predicate(value)) {
+      if (depth > 1) {
+        // Recursively flatten arrays (susceptible to call stack limits).
+        baseFlatten(value, depth - 1, predicate, isStrict, result);
+      } else {
+        arrayPush(result, value);
+      }
+    } else if (!isStrict) {
+      result[result.length] = value;
+    }
+  }
+  return result;
+}
+
+/* eslint-disable */
+
+/**
+ * Removes all key-value entries from the stack.
+ *
+ * @private
+ * @name clear
+ * @memberOf Stack
+ */
+function stackClear() {
+  this.__data__ = new ListCache;
+  this.size = 0;
+}
+
+/* eslint-disable */
+/**
+ * Removes `key` and its value from the stack.
+ *
+ * @private
+ * @name delete
+ * @memberOf Stack
+ * @param {string} key The key of the value to remove.
+ * @returns {boolean} Returns `true` if the entry was removed, else `false`.
+ */
+function stackDelete(key) {
+  var data = this.__data__,
+      result = data['delete'](key);
+
+  this.size = data.size;
+  return result;
+}
+
+/* eslint-disable */
+/**
+ * Gets the stack value for `key`.
+ *
+ * @private
+ * @name get
+ * @memberOf Stack
+ * @param {string} key The key of the value to get.
+ * @returns {*} Returns the entry value.
+ */
+function stackGet(key) {
+  return this.__data__.get(key);
+}
+
+/* eslint-disable */
+/**
+ * Checks if a stack value for `key` exists.
+ *
+ * @private
+ * @name has
+ * @memberOf Stack
+ * @param {string} key The key of the entry to check.
+ * @returns {boolean} Returns `true` if an entry for `key` exists, else `false`.
+ */
+function stackHas(key) {
+  return this.__data__.has(key);
+}
+
+/* eslint-disable */
+
+/** Used as the size to enable large array optimizations. */
+var LARGE_ARRAY_SIZE$2 = 200;
+
+/**
+ * Sets the stack `key` to `value`.
+ *
+ * @private
+ * @name set
+ * @memberOf Stack
+ * @param {string} key The key of the value to set.
+ * @param {*} value The value to set.
+ * @returns {Object} Returns the stack cache instance.
+ */
+function stackSet(key, value) {
+  var data = this.__data__;
+  if (data instanceof ListCache) {
+    var pairs = data.__data__;
+    if (!Map || (pairs.length < LARGE_ARRAY_SIZE$2 - 1)) {
+      pairs.push([key, value]);
+      this.size = ++data.size;
+      return this;
+    }
+    data = this.__data__ = new MapCache(pairs);
+  }
+  data.set(key, value);
+  this.size = data.size;
+  return this;
+}
+
+/* eslint-disable */
+
+/**
+ * Creates a stack cache object to store key-value pairs.
+ *
+ * @private
+ * @constructor
+ * @param {Array} [entries] The key-value pairs to cache.
+ */
+function Stack(entries) {
+  var data = this.__data__ = new ListCache(entries);
+  this.size = data.size;
+}
+
+// Add methods to `Stack`.
+Stack.prototype.clear = stackClear;
+Stack.prototype['delete'] = stackDelete;
+Stack.prototype.get = stackGet;
+Stack.prototype.has = stackHas;
+Stack.prototype.set = stackSet;
+
+/* eslint-disable */
+/**
+ * A specialized version of `_.filter` for arrays without support for
+ * iteratee shorthands.
+ *
+ * @private
+ * @param {Array} [array] The array to iterate over.
+ * @param {Function} predicate The function invoked per iteration.
+ * @returns {Array} Returns the new filtered array.
+ */
+function arrayFilter(array, predicate) {
+  var index = -1,
+      length = array == null ? 0 : array.length,
+      resIndex = 0,
+      result = [];
+
+  while (++index < length) {
+    var value = array[index];
+    if (predicate(value, index, array)) {
+      result[resIndex++] = value;
+    }
+  }
+  return result;
+}
+
+/* eslint-disable */
+/**
+ * This method returns a new empty array.
+ *
+ * @static
+ * @memberOf _
+ * @since 4.13.0
+ * @category Util
+ * @returns {Array} Returns the new empty array.
+ * @example
+ *
+ * var arrays = _.times(2, _.stubArray);
+ *
+ * console.log(arrays);
+ * // => [[], []]
+ *
+ * console.log(arrays[0] === arrays[1]);
+ * // => false
+ */
+function stubArray() {
+  return [];
+}
+
+/* eslint-disable */
+
+/** Used for built-in method references. */
+var objectProto$2 = Object.prototype;
+
+/** Built-in value references. */
+var propertyIsEnumerable = objectProto$2.propertyIsEnumerable;
+
+/* Built-in method references for those with the same name as other `lodash` methods. */
+var nativeGetSymbols = Object.getOwnPropertySymbols;
+
+/**
+ * Creates an array of the own enumerable symbols of `object`.
+ *
+ * @private
+ * @param {Object} object The object to query.
+ * @returns {Array} Returns the array of symbols.
+ */
+var getSymbols = !nativeGetSymbols ? stubArray : function(object) {
+  if (object == null) {
+    return [];
+  }
+  object = Object(object);
+  return arrayFilter(nativeGetSymbols(object), function(symbol) {
+    return propertyIsEnumerable.call(object, symbol);
+  });
+};
+
+/* eslint-disable */
+
+/**
+ * The base implementation of `getAllKeys` and `getAllKeysIn` which uses
+ * `keysFunc` and `symbolsFunc` to get the enumerable property names and
+ * symbols of `object`.
+ *
+ * @private
+ * @param {Object} object The object to query.
+ * @param {Function} keysFunc The function to get the keys of `object`.
+ * @param {Function} symbolsFunc The function to get the symbols of `object`.
+ * @returns {Array} Returns the array of property names and symbols.
+ */
+function baseGetAllKeys(object, keysFunc, symbolsFunc) {
+  var result = keysFunc(object);
+  return isArray(object) ? result : arrayPush(result, symbolsFunc(object));
+}
+
+/* eslint-disable */
+
+/**
+ * Creates an array of own enumerable property names and symbols of `object`.
+ *
+ * @private
+ * @param {Object} object The object to query.
+ * @returns {Array} Returns the array of property names and symbols.
+ */
+function getAllKeys(object) {
+  return baseGetAllKeys(object, keys, getSymbols);
+}
+
+/* eslint-disable */
+
+/* Built-in method references that are verified to be native. */
+var DataView = getNative(root, 'DataView');
+
+/* eslint-disable */
+
+/* Built-in method references that are verified to be native. */
+var Promise$1 = getNative(root, 'Promise');
+
+/* eslint-disable */
+
+/* Built-in method references that are verified to be native. */
+var Set = getNative(root, 'Set');
+
+/* eslint-disable */
+
+/** `Object#toString` result references. */
+var mapTag$1 = '[object Map]',
+    objectTag$1 = '[object Object]',
+    promiseTag = '[object Promise]',
+    setTag$1 = '[object Set]',
+    weakMapTag = '[object WeakMap]';
+
+var dataViewTag$1 = '[object DataView]';
+
+/** Used to detect maps, sets, and weakmaps. */
+var dataViewCtorString = toSource(DataView),
+    mapCtorString = toSource(Map),
+    promiseCtorString = toSource(Promise$1),
+    setCtorString = toSource(Set),
+    weakMapCtorString = toSource(WeakMap);
+
+/**
+ * Gets the `toStringTag` of `value`.
+ *
+ * @private
+ * @param {*} value The value to query.
+ * @returns {string} Returns the `toStringTag`.
+ */
+var getTag = baseGetTag;
+
+// Fallback for data views, maps, sets, and weak maps in IE 11 and promises in Node.js < 6.
+if ((DataView && getTag(new DataView(new ArrayBuffer(1))) != dataViewTag$1) ||
+    (Map && getTag(new Map) != mapTag$1) ||
+    (Promise$1 && getTag(Promise$1.resolve()) != promiseTag) ||
+    (Set && getTag(new Set) != setTag$1) ||
+    (WeakMap && getTag(new WeakMap) != weakMapTag)) {
+  getTag = function(value) {
+    var result = baseGetTag(value),
+        Ctor = result == objectTag$1 ? value.constructor : undefined,
+        ctorString = Ctor ? toSource(Ctor) : '';
+
+    if (ctorString) {
+      switch (ctorString) {
+        case dataViewCtorString: return dataViewTag$1;
+        case mapCtorString: return mapTag$1;
+        case promiseCtorString: return promiseTag;
+        case setCtorString: return setTag$1;
+        case weakMapCtorString: return weakMapTag;
+      }
+    }
+    return result;
+  };
+}
+
+var getTag$1 = getTag;
+
+/* eslint-disable */
+
+/** Built-in value references. */
+var Uint8Array = root.Uint8Array;
+
+/* eslint-disable */
+/** Used to stand-in for `undefined` hash values. */
+var HASH_UNDEFINED = '__lodash_hash_undefined__';
+
+/**
+ * Adds `value` to the array cache.
+ *
+ * @private
+ * @name add
+ * @memberOf SetCache
+ * @alias push
+ * @param {*} value The value to cache.
+ * @returns {Object} Returns the cache instance.
+ */
+function setCacheAdd(value) {
+  this.__data__.set(value, HASH_UNDEFINED);
+  return this;
+}
+
+/* eslint-disable */
+/**
+ * Checks if `value` is in the array cache.
+ *
+ * @private
+ * @name has
+ * @memberOf SetCache
+ * @param {*} value The value to search for.
+ * @returns {number} Returns `true` if `value` is found, else `false`.
+ */
+function setCacheHas(value) {
+  return this.__data__.has(value);
+}
+
+/* eslint-disable */
+
+/**
+ *
+ * Creates an array cache object to store unique values.
+ *
+ * @private
+ * @constructor
+ * @param {Array} [values] The values to cache.
+ */
+function SetCache(values) {
+  var index = -1,
+      length = values == null ? 0 : values.length;
+
+  this.__data__ = new MapCache;
+  while (++index < length) {
+    this.add(values[index]);
+  }
+}
+
+// Add methods to `SetCache`.
+SetCache.prototype.add = SetCache.prototype.push = setCacheAdd;
+SetCache.prototype.has = setCacheHas;
+
+/* eslint-disable */
+/**
+ * A specialized version of `_.some` for arrays without support for iteratee
+ * shorthands.
+ *
+ * @private
+ * @param {Array} [array] The array to iterate over.
+ * @param {Function} predicate The function invoked per iteration.
+ * @returns {boolean} Returns `true` if any element passes the predicate check,
+ *  else `false`.
+ */
+function arraySome(array, predicate) {
+  var index = -1,
+      length = array == null ? 0 : array.length;
+
+  while (++index < length) {
+    if (predicate(array[index], index, array)) {
+      return true;
+    }
+  }
+  return false;
+}
+
+/* eslint-disable */
+/**
+ * Checks if a `cache` value for `key` exists.
+ *
+ * @private
+ * @param {Object} cache The cache to query.
+ * @param {string} key The key of the entry to check.
+ * @returns {boolean} Returns `true` if an entry for `key` exists, else `false`.
+ */
+function cacheHas(cache, key) {
+  return cache.has(key);
+}
+
+/* eslint-disable */
+
+/** Used to compose bitmasks for value comparisons. */
+var COMPARE_PARTIAL_FLAG$5 = 1,
+    COMPARE_UNORDERED_FLAG$3 = 2;
+
+/**
+ * A specialized version of `baseIsEqualDeep` for arrays with support for
+ * partial deep comparisons.
+ *
+ * @private
+ * @param {Array} array The array to compare.
+ * @param {Array} other The other array to compare.
+ * @param {number} bitmask The bitmask flags. See `baseIsEqual` for more details.
+ * @param {Function} customizer The function to customize comparisons.
+ * @param {Function} equalFunc The function to determine equivalents of values.
+ * @param {Object} stack Tracks traversed `array` and `other` objects.
+ * @returns {boolean} Returns `true` if the arrays are equivalent, else `false`.
+ */
+function equalArrays(array, other, bitmask, customizer, equalFunc, stack) {
+  var isPartial = bitmask & COMPARE_PARTIAL_FLAG$5,
+      arrLength = array.length,
+      othLength = other.length;
+
+  if (arrLength != othLength && !(isPartial && othLength > arrLength)) {
+    return false;
+  }
+  // Check that cyclic values are equal.
+  var arrStacked = stack.get(array);
+  var othStacked = stack.get(other);
+  if (arrStacked && othStacked) {
+    return arrStacked == other && othStacked == array;
+  }
+  var index = -1,
+      result = true,
+      seen = (bitmask & COMPARE_UNORDERED_FLAG$3) ? new SetCache : undefined;
+
+  stack.set(array, other);
+  stack.set(other, array);
+
+  // Ignore non-index properties.
+  while (++index < arrLength) {
+    var arrValue = array[index],
+        othValue = other[index];
+
+    if (customizer) {
+      var compared = isPartial
+        ? customizer(othValue, arrValue, index, other, array, stack)
+        : customizer(arrValue, othValue, index, array, other, stack);
+    }
+    if (compared !== undefined) {
+      if (compared) {
+        continue;
+      }
+      result = false;
+      break;
+    }
+    // Recursively compare arrays (susceptible to call stack limits).
+    if (seen) {
+      if (!arraySome(other, function(othValue, othIndex) {
+            if (!cacheHas(seen, othIndex) &&
+                (arrValue === othValue || equalFunc(arrValue, othValue, bitmask, customizer, stack))) {
+              return seen.push(othIndex);
+            }
+          })) {
+        result = false;
+        break;
+      }
+    } else if (!(
+          arrValue === othValue ||
+            equalFunc(arrValue, othValue, bitmask, customizer, stack)
+        )) {
+      result = false;
+      break;
+    }
+  }
+  stack['delete'](array);
+  stack['delete'](other);
+  return result;
+}
+
+/* eslint-disable */
+/**
+ * Converts `map` to its key-value pairs.
+ *
+ * @private
+ * @param {Object} map The map to convert.
+ * @returns {Array} Returns the key-value pairs.
+ */
+function mapToArray(map) {
+  var index = -1,
+      result = Array(map.size);
+
+  map.forEach(function(value, key) {
+    result[++index] = [key, value];
+  });
+  return result;
+}
+
+/* eslint-disable */
+/**
+ * Converts `set` to an array of its values.
+ *
+ * @private
+ * @param {Object} set The set to convert.
+ * @returns {Array} Returns the values.
+ */
+function setToArray(set) {
+  var index = -1,
+      result = Array(set.size);
+
+  set.forEach(function(value) {
+    result[++index] = value;
+  });
+  return result;
+}
+
+/* eslint-disable */
+
+/** Used to compose bitmasks for value comparisons. */
+var COMPARE_PARTIAL_FLAG$4 = 1,
+    COMPARE_UNORDERED_FLAG$2 = 2;
+
+/** `Object#toString` result references. */
+var boolTag = '[object Boolean]',
+    dateTag = '[object Date]',
+    errorTag = '[object Error]',
+    mapTag = '[object Map]',
+    numberTag = '[object Number]',
+    regexpTag = '[object RegExp]',
+    setTag = '[object Set]',
+    stringTag = '[object String]',
+    symbolTag = '[object Symbol]';
+
+var arrayBufferTag = '[object ArrayBuffer]',
+    dataViewTag = '[object DataView]';
+
+/** Used to convert symbols to primitives and strings. */
+var symbolProto = Symbol ? Symbol.prototype : undefined,
+    symbolValueOf = symbolProto ? symbolProto.valueOf : undefined;
+
+/**
+ * A specialized version of `baseIsEqualDeep` for comparing objects of
+ * the same `toStringTag`.
+ *
+ * **Note:** This function only supports comparing values with tags of
+ * `Boolean`, `Date`, `Error`, `Number`, `RegExp`, or `String`.
+ *
+ * @private
+ * @param {Object} object The object to compare.
+ * @param {Object} other The other object to compare.
+ * @param {string} tag The `toStringTag` of the objects to compare.
+ * @param {number} bitmask The bitmask flags. See `baseIsEqual` for more details.
+ * @param {Function} customizer The function to customize comparisons.
+ * @param {Function} equalFunc The function to determine equivalents of values.
+ * @param {Object} stack Tracks traversed `object` and `other` objects.
+ * @returns {boolean} Returns `true` if the objects are equivalent, else `false`.
+ */
+function equalByTag(object, other, tag, bitmask, customizer, equalFunc, stack) {
+  switch (tag) {
+    case dataViewTag:
+      if ((object.byteLength != other.byteLength) ||
+          (object.byteOffset != other.byteOffset)) {
+        return false;
+      }
+      object = object.buffer;
+      other = other.buffer;
+
+    case arrayBufferTag:
+      if ((object.byteLength != other.byteLength) ||
+          !equalFunc(new Uint8Array(object), new Uint8Array(other))) {
+        return false;
+      }
+      return true;
+
+    case boolTag:
+    case dateTag:
+    case numberTag:
+      // Coerce booleans to `1` or `0` and dates to milliseconds.
+      // Invalid dates are coerced to `NaN`.
+      return eq(+object, +other);
+
+    case errorTag:
+      return object.name == other.name && object.message == other.message;
+
+    case regexpTag:
+    case stringTag:
+      // Coerce regexes to strings and treat strings, primitives and objects,
+      // as equal. See http://www.ecma-international.org/ecma-262/7.0/#sec-regexp.prototype.tostring
+      // for more details.
+      return object == (other + '');
+
+    case mapTag:
+      var convert = mapToArray;
+
+    case setTag:
+      var isPartial = bitmask & COMPARE_PARTIAL_FLAG$4;
+      convert || (convert = setToArray);
+
+      if (object.size != other.size && !isPartial) {
+        return false;
+      }
+      // Assume cyclic values are equal.
+      var stacked = stack.get(object);
+      if (stacked) {
+        return stacked == other;
+      }
+      bitmask |= COMPARE_UNORDERED_FLAG$2;
+
+      // Recursively compare objects (susceptible to call stack limits).
+      stack.set(object, other);
+      var result = equalArrays(convert(object), convert(other), bitmask, customizer, equalFunc, stack);
+      stack['delete'](object);
+      return result;
+
+    case symbolTag:
+      if (symbolValueOf) {
+        return symbolValueOf.call(object) == symbolValueOf.call(other);
+      }
+  }
+  return false;
+}
+
+/* eslint-disable */
+
+/** Used to compose bitmasks for value comparisons. */
+var COMPARE_PARTIAL_FLAG$3 = 1;
+
+/** Used for built-in method references. */
+var objectProto$1 = Object.prototype;
+
+/** Used to check objects for own properties. */
+var hasOwnProperty$1 = objectProto$1.hasOwnProperty;
+
+/**
+ * A specialized version of `baseIsEqualDeep` for objects with support for
+ * partial deep comparisons.
+ *
+ * @private
+ * @param {Object} object The object to compare.
+ * @param {Object} other The other object to compare.
+ * @param {number} bitmask The bitmask flags. See `baseIsEqual` for more details.
+ * @param {Function} customizer The function to customize comparisons.
+ * @param {Function} equalFunc The function to determine equivalents of values.
+ * @param {Object} stack Tracks traversed `object` and `other` objects.
+ * @returns {boolean} Returns `true` if the objects are equivalent, else `false`.
+ */
+function equalObjects(object, other, bitmask, customizer, equalFunc, stack) {
+  var isPartial = bitmask & COMPARE_PARTIAL_FLAG$3,
+      objProps = getAllKeys(object),
+      objLength = objProps.length,
+      othProps = getAllKeys(other),
+      othLength = othProps.length;
+
+  if (objLength != othLength && !isPartial) {
+    return false;
+  }
+  var index = objLength;
+  while (index--) {
+    var key = objProps[index];
+    if (!(isPartial ? key in other : hasOwnProperty$1.call(other, key))) {
+      return false;
+    }
+  }
+  // Check that cyclic values are equal.
+  var objStacked = stack.get(object);
+  var othStacked = stack.get(other);
+  if (objStacked && othStacked) {
+    return objStacked == other && othStacked == object;
+  }
+  var result = true;
+  stack.set(object, other);
+  stack.set(other, object);
+
+  var skipCtor = isPartial;
+  while (++index < objLength) {
+    key = objProps[index];
+    var objValue = object[key],
+        othValue = other[key];
+
+    if (customizer) {
+      var compared = isPartial
+        ? customizer(othValue, objValue, key, other, object, stack)
+        : customizer(objValue, othValue, key, object, other, stack);
+    }
+    // Recursively compare objects (susceptible to call stack limits).
+    if (!(compared === undefined
+          ? (objValue === othValue || equalFunc(objValue, othValue, bitmask, customizer, stack))
+          : compared
+        )) {
+      result = false;
+      break;
+    }
+    skipCtor || (skipCtor = key == 'constructor');
+  }
+  if (result && !skipCtor) {
+    var objCtor = object.constructor,
+        othCtor = other.constructor;
+
+    // Non `Object` object instances with different constructors are not equal.
+    if (objCtor != othCtor &&
+        ('constructor' in object && 'constructor' in other) &&
+        !(typeof objCtor == 'function' && objCtor instanceof objCtor &&
+          typeof othCtor == 'function' && othCtor instanceof othCtor)) {
+      result = false;
+    }
+  }
+  stack['delete'](object);
+  stack['delete'](other);
+  return result;
+}
+
+/* eslint-disable */
+
+/** Used to compose bitmasks for value comparisons. */
+var COMPARE_PARTIAL_FLAG$2 = 1;
+
+/** `Object#toString` result references. */
+var argsTag = '[object Arguments]',
+    arrayTag = '[object Array]',
+    objectTag = '[object Object]';
+
+/** Used for built-in method references. */
+var objectProto = Object.prototype;
+
+/** Used to check objects for own properties. */
+var hasOwnProperty = objectProto.hasOwnProperty;
+
+/**
+ * A specialized version of `baseIsEqual` for arrays and objects which performs
+ * deep comparisons and tracks traversed objects enabling objects with circular
+ * references to be compared.
+ *
+ * @private
+ * @param {Object} object The object to compare.
+ * @param {Object} other The other object to compare.
+ * @param {number} bitmask The bitmask flags. See `baseIsEqual` for more details.
+ * @param {Function} customizer The function to customize comparisons.
+ * @param {Function} equalFunc The function to determine equivalents of values.
+ * @param {Object} [stack] Tracks traversed `object` and `other` objects.
+ * @returns {boolean} Returns `true` if the objects are equivalent, else `false`.
+ */
+function baseIsEqualDeep(object, other, bitmask, customizer, equalFunc, stack) {
+  var objIsArr = isArray(object),
+      othIsArr = isArray(other),
+      objTag = objIsArr ? arrayTag : getTag$1(object),
+      othTag = othIsArr ? arrayTag : getTag$1(other);
+
+  objTag = objTag == argsTag ? objectTag : objTag;
+  othTag = othTag == argsTag ? objectTag : othTag;
+
+  var objIsObj = objTag == objectTag,
+      othIsObj = othTag == objectTag,
+      isSameTag = objTag == othTag;
+
+  if (isSameTag && isBuffer(object)) {
+    if (!isBuffer(other)) {
+      return false;
+    }
+    objIsArr = true;
+    objIsObj = false;
+  }
+  if (isSameTag && !objIsObj) {
+    stack || (stack = new Stack);
+    return (objIsArr || isTypedArray(object))
+      ? equalArrays(object, other, bitmask, customizer, equalFunc, stack)
+      : equalByTag(object, other, objTag, bitmask, customizer, equalFunc, stack);
+  }
+  if (!(bitmask & COMPARE_PARTIAL_FLAG$2)) {
+    var objIsWrapped = objIsObj && hasOwnProperty.call(object, '__wrapped__'),
+        othIsWrapped = othIsObj && hasOwnProperty.call(other, '__wrapped__');
+
+    if (objIsWrapped || othIsWrapped) {
+      var objUnwrapped = objIsWrapped ? object.value() : object,
+          othUnwrapped = othIsWrapped ? other.value() : other;
+
+      stack || (stack = new Stack);
+      return equalFunc(objUnwrapped, othUnwrapped, bitmask, customizer, stack);
+    }
+  }
+  if (!isSameTag) {
+    return false;
+  }
+  stack || (stack = new Stack);
+  return equalObjects(object, other, bitmask, customizer, equalFunc, stack);
+}
+
+/* eslint-disable */
+
+/**
+ * The base implementation of `_.isEqual` which supports partial comparisons
+ * and tracks traversed objects.
+ *
+ * @private
+ * @param {*} value The value to compare.
+ * @param {*} other The other value to compare.
+ * @param {boolean} bitmask The bitmask flags.
+ *  1 - Unordered comparison
+ *  2 - Partial comparison
+ * @param {Function} [customizer] The function to customize comparisons.
+ * @param {Object} [stack] Tracks traversed `value` and `other` objects.
+ * @returns {boolean} Returns `true` if the values are equivalent, else `false`.
+ */
+function baseIsEqual(value, other, bitmask, customizer, stack) {
+  if (value === other) {
+    return true;
+  }
+  if (value == null || other == null || (!isObjectLike(value) && !isObjectLike(other))) {
+    return value !== value && other !== other;
+  }
+  return baseIsEqualDeep(value, other, bitmask, customizer, baseIsEqual, stack);
+}
+
+/* eslint-disable */
+
+/** Used to compose bitmasks for value comparisons. */
+var COMPARE_PARTIAL_FLAG$1 = 1,
+    COMPARE_UNORDERED_FLAG$1 = 2;
+
+/**
+ * The base implementation of `_.isMatch` without support for iteratee shorthands.
+ *
+ * @private
+ * @param {Object} object The object to inspect.
+ * @param {Object} source The object of property values to match.
+ * @param {Array} matchData The property names, values, and compare flags to match.
+ * @param {Function} [customizer] The function to customize comparisons.
+ * @returns {boolean} Returns `true` if `object` is a match, else `false`.
+ */
+function baseIsMatch(object, source, matchData, customizer) {
+  var index = matchData.length,
+      length = index,
+      noCustomizer = !customizer;
+
+  if (object == null) {
+    return !length;
+  }
+  object = Object(object);
+  while (index--) {
+    var data = matchData[index];
+    if ((noCustomizer && data[2])
+          ? data[1] !== object[data[0]]
+          : !(data[0] in object)
+        ) {
+      return false;
+    }
+  }
+  while (++index < length) {
+    data = matchData[index];
+    var key = data[0],
+        objValue = object[key],
+        srcValue = data[1];
+
+    if (noCustomizer && data[2]) {
+      if (objValue === undefined && !(key in object)) {
+        return false;
+      }
+    } else {
+      var stack = new Stack;
+      if (customizer) {
+        var result = customizer(objValue, srcValue, key, object, source, stack);
+      }
+      if (!(result === undefined
+            ? baseIsEqual(srcValue, objValue, COMPARE_PARTIAL_FLAG$1 | COMPARE_UNORDERED_FLAG$1, customizer, stack)
+            : result
+          )) {
+        return false;
+      }
+    }
+  }
+  return true;
+}
+
+/* eslint-disable */
+
+/**
+ * Checks if `value` is suitable for strict equality comparisons, i.e. `===`.
+ *
+ * @private
+ * @param {*} value The value to check.
+ * @returns {boolean} Returns `true` if `value` if suitable for strict
+ *  equality comparisons, else `false`.
+ */
+function isStrictComparable(value) {
+  return value === value && !isObject(value);
+}
+
+/* eslint-disable */
+
+/**
+ * Gets the property names, values, and compare flags of `object`.
+ *
+ * @private
+ * @param {Object} object The object to query.
+ * @returns {Array} Returns the match data of `object`.
+ */
+function getMatchData(object) {
+  var result = keys(object),
+      length = result.length;
+
+  while (length--) {
+    var key = result[length],
+        value = object[key];
+
+    result[length] = [key, value, isStrictComparable(value)];
+  }
+  return result;
+}
+
+/* eslint-disable */
+/**
+ * A specialized version of `matchesProperty` for source values suitable
+ * for strict equality comparisons, i.e. `===`.
+ *
+ * @private
+ * @param {string} key The key of the property to get.
+ * @param {*} srcValue The value to match.
+ * @returns {Function} Returns the new spec function.
+ */
+function matchesStrictComparable(key, srcValue) {
+  return function(object) {
+    if (object == null) {
+      return false;
+    }
+    return object[key] === srcValue &&
+      (srcValue !== undefined || (key in Object(object)));
+  };
+}
+
+/* eslint-disable */
+
+/**
+ * The base implementation of `_.matches` which doesn't clone `source`.
+ *
+ * @private
+ * @param {Object} source The object of property values to match.
+ * @returns {Function} Returns the new spec function.
+ */
+function baseMatches(source) {
+  var matchData = getMatchData(source);
+  if (matchData.length == 1 && matchData[0][2]) {
+    return matchesStrictComparable(matchData[0][0], matchData[0][1]);
+  }
+  return function(object) {
+    return object === source || baseIsMatch(object, source, matchData);
+  };
+}
+
+/* eslint-disable */
+/**
+ * The base implementation of `_.hasIn` without support for deep paths.
+ *
+ * @private
+ * @param {Object} [object] The object to query.
+ * @param {Array|string} key The key to check.
+ * @returns {boolean} Returns `true` if `key` exists, else `false`.
+ */
+function baseHasIn(object, key) {
+  return object != null && key in Object(object);
+}
+
+/* eslint-disable */
+
+/**
+ * Checks if `path` exists on `object`.
+ *
+ * @private
+ * @param {Object} object The object to query.
+ * @param {Array|string} path The path to check.
+ * @param {Function} hasFunc The function to check properties.
+ * @returns {boolean} Returns `true` if `path` exists, else `false`.
+ */
+function hasPath(object, path, hasFunc) {
+  path = castPath(path, object);
+
+  var index = -1,
+      length = path.length,
+      result = false;
+
+  while (++index < length) {
+    var key = toKey(path[index]);
+    if (!(result = object != null && hasFunc(object, key))) {
+      break;
+    }
+    object = object[key];
+  }
+  if (result || ++index != length) {
+    return result;
+  }
+  length = object == null ? 0 : object.length;
+  return !!length && isLength(length) && isIndex(key, length) &&
+    (isArray(object) || isArguments(object));
+}
+
+/* eslint-disable */
+
+/**
+ * Checks if `path` is a direct or inherited property of `object`.
+ *
+ * @static
+ * @memberOf _
+ * @since 4.0.0
+ * @category Object
+ * @param {Object} object The object to query.
+ * @param {Array|string} path The path to check.
+ * @returns {boolean} Returns `true` if `path` exists, else `false`.
+ * @example
+ *
+ * var object = _.create({ 'a': _.create({ 'b': 2 }) });
+ *
+ * _.hasIn(object, 'a');
+ * // => true
+ *
+ * _.hasIn(object, 'a.b');
+ * // => true
+ *
+ * _.hasIn(object, ['a', 'b']);
+ * // => true
+ *
+ * _.hasIn(object, 'b');
+ * // => false
+ */
+function hasIn(object, path) {
+  return object != null && hasPath(object, path, baseHasIn);
+}
+
+/* eslint-disable */
+
+/** Used to compose bitmasks for value comparisons. */
+var COMPARE_PARTIAL_FLAG = 1,
+    COMPARE_UNORDERED_FLAG = 2;
+
+/**
+ * The base implementation of `_.matchesProperty` which doesn't clone `srcValue`.
+ *
+ * @private
+ * @param {string} path The path of the property to get.
+ * @param {*} srcValue The value to match.
+ * @returns {Function} Returns the new spec function.
+ */
+function baseMatchesProperty(path, srcValue) {
+  if (isKey(path) && isStrictComparable(srcValue)) {
+    return matchesStrictComparable(toKey(path), srcValue);
+  }
+  return function(object) {
+    var objValue = get(object, path);
+    return (objValue === undefined && objValue === srcValue)
+      ? hasIn(object, path)
+      : baseIsEqual(srcValue, objValue, COMPARE_PARTIAL_FLAG | COMPARE_UNORDERED_FLAG);
+  };
+}
+
+/* eslint-disable */
+/**
+ * The base implementation of `_.property` without support for deep paths.
+ *
+ * @private
+ * @param {string} key The key of the property to get.
+ * @returns {Function} Returns the new accessor function.
+ */
+function baseProperty(key) {
+  return function(object) {
+    return object == null ? undefined : object[key];
+  };
+}
+
+/* eslint-disable */
+
+/**
+ * A specialized version of `baseProperty` which supports deep paths.
+ *
+ * @private
+ * @param {Array|string} path The path of the property to get.
+ * @returns {Function} Returns the new accessor function.
+ */
+function basePropertyDeep(path) {
+  return function(object) {
+    return baseGet(object, path);
+  };
+}
+
+/* eslint-disable */
+
+/**
+ * Creates a function that returns the value at `path` of a given object.
+ *
+ * @static
+ * @memberOf _
+ * @since 2.4.0
+ * @category Util
+ * @param {Array|string} path The path of the property to get.
+ * @returns {Function} Returns the new accessor function.
+ * @example
+ *
+ * var objects = [
+ *   { 'a': { 'b': 2 } },
+ *   { 'a': { 'b': 1 } }
+ * ];
+ *
+ * _.map(objects, _.property('a.b'));
+ * // => [2, 1]
+ *
+ * _.map(_.sortBy(objects, _.property(['a', 'b'])), 'a.b');
+ * // => [1, 2]
+ */
+function property(path) {
+  return isKey(path) ? baseProperty(toKey(path)) : basePropertyDeep(path);
+}
+
+/* eslint-disable */
+
+/**
+ * The base implementation of `_.iteratee`.
+ *
+ * @private
+ * @param {*} [value=_.identity] The value to convert to an iteratee.
+ * @returns {Function} Returns the iteratee.
+ */
+function baseIteratee(value) {
+  // Don't store the `typeof` result in a variable to avoid a JIT bug in Safari 9.
+  // See https://bugs.webkit.org/show_bug.cgi?id=156034 for more details.
+  if (typeof value == 'function') {
+    return value;
+  }
+  if (value == null) {
+    return identity;
+  }
+  if (typeof value == 'object') {
+    return isArray(value)
+      ? baseMatchesProperty(value[0], value[1])
+      : baseMatches(value);
+  }
+  return property(value);
+}
+
+/* eslint-disable */
+
+/**
+ * This method is like `_.isArrayLike` except that it also checks if `value`
+ * is an object.
+ *
+ * @static
+ * @memberOf _
+ * @since 4.0.0
+ * @category Lang
+ * @param {*} value The value to check.
+ * @returns {boolean} Returns `true` if `value` is an array-like object,
+ *  else `false`.
+ * @example
+ *
+ * _.isArrayLikeObject([1, 2, 3]);
+ * // => true
+ *
+ * _.isArrayLikeObject(document.body.children);
+ * // => true
+ *
+ * _.isArrayLikeObject('abc');
+ * // => false
+ *
+ * _.isArrayLikeObject(_.noop);
+ * // => false
+ */
+function isArrayLikeObject(value) {
+  return isObjectLike(value) && isArrayLike(value);
+}
+
+/* eslint-disable */
+/**
+ * This function is like `arrayIncludes` except that it accepts a comparator.
+ *
+ * @private
+ * @param {Array} [array] The array to inspect.
+ * @param {*} target The value to search for.
+ * @param {Function} comparator The comparator invoked per element.
+ * @returns {boolean} Returns `true` if `target` is found, else `false`.
+ */
+function arrayIncludesWith(array, value, comparator) {
+  var index = -1,
+      length = array == null ? 0 : array.length;
+
+  while (++index < length) {
+    if (comparator(value, array[index])) {
+      return true;
+    }
+  }
+  return false;
+}
+
+/* eslint-disable */
+
+/** Used as the size to enable large array optimizations. */
+var LARGE_ARRAY_SIZE$1 = 200;
+
+/**
+ * The base implementation of methods like `_.difference` without support
+ * for excluding multiple arrays or iteratee shorthands.
+ *
+ * @private
+ * @param {Array} array The array to inspect.
+ * @param {Array} values The values to exclude.
+ * @param {Function} [iteratee] The iteratee invoked per element.
+ * @param {Function} [comparator] The comparator invoked per element.
+ * @returns {Array} Returns the new array of filtered values.
+ */
+function baseDifference(array, values, iteratee, comparator) {
+  var index = -1,
+      includes = arrayIncludes,
+      isCommon = true,
+      length = array.length,
+      result = [],
+      valuesLength = values.length;
+
+  if (!length) {
+    return result;
+  }
+  if (iteratee) {
+    values = arrayMap(values, baseUnary(iteratee));
+  }
+  if (comparator) {
+    includes = arrayIncludesWith;
+    isCommon = false;
+  }
+  else if (values.length >= LARGE_ARRAY_SIZE$1) {
+    includes = cacheHas;
+    isCommon = false;
+    values = new SetCache(values);
+  }
+  outer:
+  while (++index < length) {
+    var value = array[index],
+        computed = iteratee == null ? value : iteratee(value);
+
+    value = (comparator || value !== 0) ? value : 0;
+    if (isCommon && computed === computed) {
+      var valuesIndex = valuesLength;
+      while (valuesIndex--) {
+        if (values[valuesIndex] === computed) {
+          continue outer;
+        }
+      }
+      result.push(value);
+    }
+    else if (!includes(values, computed, comparator)) {
+      result.push(value);
+    }
+  }
+  return result;
+}
+
+/* eslint-disable */
+
+/**
+ * Creates an array of `array` values not included in the other given arrays
+ * using [`SameValueZero`](http://ecma-international.org/ecma-262/7.0/#sec-samevaluezero)
+ * for equality comparisons. The order and references of result values are
+ * determined by the first array.
+ *
+ * **Note:** Unlike `_.pullAll`, this method returns a new array.
+ *
+ * @static
+ * @memberOf _
+ * @since 0.1.0
+ * @category Array
+ * @param {Array} array The array to inspect.
+ * @param {...Array} [values] The values to exclude.
+ * @returns {Array} Returns the new array of filtered values.
+ * @see _.without, _.xor
+ * @example
+ *
+ * _.difference([2, 1], [2, 3]);
+ * // => [1]
+ */
+var difference = baseRest(function(array, values) {
+  return isArrayLikeObject(array)
+    ? baseDifference(array, baseFlatten(values, 1, isArrayLikeObject, true))
+    : [];
+});
+
+/* eslint-disable */
+
+/**
+ * Performs a deep comparison between two values to determine if they are
+ * equivalent.
+ *
+ * **Note:** This method supports comparing arrays, array buffers, booleans,
+ * date objects, error objects, maps, numbers, `Object` objects, regexes,
+ * sets, strings, symbols, and typed arrays. `Object` objects are compared
+ * by their own, not inherited, enumerable properties. Functions and DOM
+ * nodes are compared by strict equality, i.e. `===`.
+ *
+ * @static
+ * @memberOf _
+ * @since 0.1.0
+ * @category Lang
+ * @param {*} value The value to compare.
+ * @param {*} other The other value to compare.
+ * @returns {boolean} Returns `true` if the values are equivalent, else `false`.
+ * @example
+ *
+ * var object = { 'a': 1 };
+ * var other = { 'a': 1 };
+ *
+ * _.isEqual(object, other);
+ * // => true
+ *
+ * object === other;
+ * // => false
+ */
+function isEqual(value, other) {
+  return baseIsEqual(value, other);
+}
+
+/* eslint-disable */
+
+/** Used as references for various `Number` constants. */
+var INFINITY = 1 / 0;
+
+/**
+ * Creates a set object of `values`.
+ *
+ * @private
+ * @param {Array} values The values to add to the set.
+ * @returns {Object} Returns the new set.
+ */
+var createSet = !(Set && (1 / setToArray(new Set([,-0]))[1]) == INFINITY) ? noop : function(values) {
+  return new Set(values);
+};
+
+/* eslint-disable */
+
+/** Used as the size to enable large array optimizations. */
+var LARGE_ARRAY_SIZE = 200;
+
+/**
+ * The base implementation of `_.uniqBy` without support for iteratee shorthands.
+ *
+ * @private
+ * @param {Array} array The array to inspect.
+ * @param {Function} [iteratee] The iteratee invoked per element.
+ * @param {Function} [comparator] The comparator invoked per element.
+ * @returns {Array} Returns the new duplicate free array.
+ */
+function baseUniq(array, iteratee, comparator) {
+  var index = -1,
+      includes = arrayIncludes,
+      length = array.length,
+      isCommon = true,
+      result = [],
+      seen = result;
+
+  if (comparator) {
+    isCommon = false;
+    includes = arrayIncludesWith;
+  }
+  else if (length >= LARGE_ARRAY_SIZE) {
+    var set = iteratee ? null : createSet(array);
+    if (set) {
+      return setToArray(set);
+    }
+    isCommon = false;
+    includes = cacheHas;
+    seen = new SetCache;
+  }
+  else {
+    seen = iteratee ? [] : result;
+  }
+  outer:
+  while (++index < length) {
+    var value = array[index],
+        computed = iteratee ? iteratee(value) : value;
+
+    value = (comparator || value !== 0) ? value : 0;
+    if (isCommon && computed === computed) {
+      var seenIndex = seen.length;
+      while (seenIndex--) {
+        if (seen[seenIndex] === computed) {
+          continue outer;
+        }
+      }
+      if (iteratee) {
+        seen.push(computed);
+      }
+      result.push(value);
+    }
+    else if (!includes(seen, computed, comparator)) {
+      if (seen !== result) {
+        seen.push(computed);
+      }
+      result.push(value);
+    }
+  }
+  return result;
+}
+
+/* eslint-disable */
+
+/**
+ * This method is like `_.uniq` except that it accepts `iteratee` which is
+ * invoked for each element in `array` to generate the criterion by which
+ * uniqueness is computed. The order of result values is determined by the
+ * order they occur in the array. The iteratee is invoked with one argument:
+ * (value).
+ *
+ * @static
+ * @memberOf _
+ * @since 4.0.0
+ * @category Array
+ * @param {Array} array The array to inspect.
+ * @param {Function} [iteratee=_.identity] The iteratee invoked per element.
+ * @returns {Array} Returns the new duplicate free array.
+ * @example
+ *
+ * _.uniqBy([2.1, 1.2, 2.3], Math.floor);
+ * // => [2.1, 1.2]
+ *
+ * // The `_.property` iteratee shorthand.
+ * _.uniqBy([{ 'x': 1 }, { 'x': 2 }, { 'x': 1 }], 'x');
+ * // => [{ 'x': 1 }, { 'x': 2 }]
+ */
+function uniqBy(array, iteratee) {
+  return (array && array.length) ? baseUniq(array, baseIteratee(iteratee)) : [];
+}
+
+export { difference, isEqual, uniqBy };
diff --git a/src/routes/_thirdparty/lodash/objects.src.js b/src/routes/_thirdparty/lodash/objects.src.js
new file mode 100644
index 00000000..404b94df
--- /dev/null
+++ b/src/routes/_thirdparty/lodash/objects.src.js
@@ -0,0 +1 @@
+export { isEqual, difference, uniqBy } from 'lodash-es'
diff --git a/src/routes/_thirdparty/lodash/rollup.config.js b/src/routes/_thirdparty/lodash/rollup.config.js
new file mode 100644
index 00000000..581ce66c
--- /dev/null
+++ b/src/routes/_thirdparty/lodash/rollup.config.js
@@ -0,0 +1,32 @@
+import resolve from '@rollup/plugin-node-resolve'
+
+// Moved Rollup into _thirdparty to avoid issues with "type": "module"
+// Build with:
+// yarn add @rollup/plugin-node-resolve lodash-es
+// npx rollup -c ./src/routes/_thirdparty/lodash/rollup.config.js
+// yarn remove @rollup/plugin-node-resolve lodash-es
+
+function createConfig (file) {
+  const input = `./src/routes/_thirdparty/lodash/${file}`
+  return {
+    input,
+    output: {
+      file: input.replace('.src.js', '.js'),
+      format: 'esm'
+    },
+    plugins: [
+      resolve(),
+      {
+        name: 'add-header',
+        transform (code) {
+          return '/* eslint-disable */\n' + code
+        }
+      }
+    ]
+  }
+}
+
+export default [
+  createConfig('timers.src.js'),
+  createConfig('objects.src.js')
+]
diff --git a/src/routes/_thirdparty/lodash/timers.js b/src/routes/_thirdparty/lodash/timers.js
new file mode 100644
index 00000000..25d95c04
--- /dev/null
+++ b/src/routes/_thirdparty/lodash/timers.js
@@ -0,0 +1,572 @@
+/* eslint-disable */
+/** Detect free variable `global` from Node.js. */
+var freeGlobal = typeof global == 'object' && global && global.Object === Object && global;
+
+/* eslint-disable */
+
+/** Detect free variable `self`. */
+var freeSelf = typeof self == 'object' && self && self.Object === Object && self;
+
+/** Used as a reference to the global object. */
+var root = freeGlobal || freeSelf || Function('return this')();
+
+/* eslint-disable */
+
+/** Built-in value references. */
+var Symbol = root.Symbol;
+
+/* eslint-disable */
+
+/** Used for built-in method references. */
+var objectProto$1 = Object.prototype;
+
+/** Used to check objects for own properties. */
+var hasOwnProperty = objectProto$1.hasOwnProperty;
+
+/**
+ * Used to resolve the
+ * [`toStringTag`](http://ecma-international.org/ecma-262/7.0/#sec-object.prototype.tostring)
+ * of values.
+ */
+var nativeObjectToString$1 = objectProto$1.toString;
+
+/** Built-in value references. */
+var symToStringTag$1 = Symbol ? Symbol.toStringTag : undefined;
+
+/**
+ * A specialized version of `baseGetTag` which ignores `Symbol.toStringTag` values.
+ *
+ * @private
+ * @param {*} value The value to query.
+ * @returns {string} Returns the raw `toStringTag`.
+ */
+function getRawTag(value) {
+  var isOwn = hasOwnProperty.call(value, symToStringTag$1),
+      tag = value[symToStringTag$1];
+
+  try {
+    value[symToStringTag$1] = undefined;
+    var unmasked = true;
+  } catch (e) {}
+
+  var result = nativeObjectToString$1.call(value);
+  if (unmasked) {
+    if (isOwn) {
+      value[symToStringTag$1] = tag;
+    } else {
+      delete value[symToStringTag$1];
+    }
+  }
+  return result;
+}
+
+/* eslint-disable */
+/** Used for built-in method references. */
+var objectProto = Object.prototype;
+
+/**
+ * Used to resolve the
+ * [`toStringTag`](http://ecma-international.org/ecma-262/7.0/#sec-object.prototype.tostring)
+ * of values.
+ */
+var nativeObjectToString = objectProto.toString;
+
+/**
+ * Converts `value` to a string using `Object.prototype.toString`.
+ *
+ * @private
+ * @param {*} value The value to convert.
+ * @returns {string} Returns the converted string.
+ */
+function objectToString(value) {
+  return nativeObjectToString.call(value);
+}
+
+/* eslint-disable */
+
+/** `Object#toString` result references. */
+var nullTag = '[object Null]',
+    undefinedTag = '[object Undefined]';
+
+/** Built-in value references. */
+var symToStringTag = Symbol ? Symbol.toStringTag : undefined;
+
+/**
+ * The base implementation of `getTag` without fallbacks for buggy environments.
+ *
+ * @private
+ * @param {*} value The value to query.
+ * @returns {string} Returns the `toStringTag`.
+ */
+function baseGetTag(value) {
+  if (value == null) {
+    return value === undefined ? undefinedTag : nullTag;
+  }
+  return (symToStringTag && symToStringTag in Object(value))
+    ? getRawTag(value)
+    : objectToString(value);
+}
+
+/* eslint-disable */
+/**
+ * Checks if `value` is object-like. A value is object-like if it's not `null`
+ * and has a `typeof` result of "object".
+ *
+ * @static
+ * @memberOf _
+ * @since 4.0.0
+ * @category Lang
+ * @param {*} value The value to check.
+ * @returns {boolean} Returns `true` if `value` is object-like, else `false`.
+ * @example
+ *
+ * _.isObjectLike({});
+ * // => true
+ *
+ * _.isObjectLike([1, 2, 3]);
+ * // => true
+ *
+ * _.isObjectLike(_.noop);
+ * // => false
+ *
+ * _.isObjectLike(null);
+ * // => false
+ */
+function isObjectLike(value) {
+  return value != null && typeof value == 'object';
+}
+
+/* eslint-disable */
+
+/** `Object#toString` result references. */
+var symbolTag = '[object Symbol]';
+
+/**
+ * Checks if `value` is classified as a `Symbol` primitive or object.
+ *
+ * @static
+ * @memberOf _
+ * @since 4.0.0
+ * @category Lang
+ * @param {*} value The value to check.
+ * @returns {boolean} Returns `true` if `value` is a symbol, else `false`.
+ * @example
+ *
+ * _.isSymbol(Symbol.iterator);
+ * // => true
+ *
+ * _.isSymbol('abc');
+ * // => false
+ */
+function isSymbol(value) {
+  return typeof value == 'symbol' ||
+    (isObjectLike(value) && baseGetTag(value) == symbolTag);
+}
+
+/* eslint-disable */
+/** Used to match a single whitespace character. */
+var reWhitespace = /\s/;
+
+/**
+ * Used by `_.trim` and `_.trimEnd` to get the index of the last non-whitespace
+ * character of `string`.
+ *
+ * @private
+ * @param {string} string The string to inspect.
+ * @returns {number} Returns the index of the last non-whitespace character.
+ */
+function trimmedEndIndex(string) {
+  var index = string.length;
+
+  while (index-- && reWhitespace.test(string.charAt(index))) {}
+  return index;
+}
+
+/* eslint-disable */
+
+/** Used to match leading whitespace. */
+var reTrimStart = /^\s+/;
+
+/**
+ * The base implementation of `_.trim`.
+ *
+ * @private
+ * @param {string} string The string to trim.
+ * @returns {string} Returns the trimmed string.
+ */
+function baseTrim(string) {
+  return string
+    ? string.slice(0, trimmedEndIndex(string) + 1).replace(reTrimStart, '')
+    : string;
+}
+
+/* eslint-disable */
+/**
+ * Checks if `value` is the
+ * [language type](http://www.ecma-international.org/ecma-262/7.0/#sec-ecmascript-language-types)
+ * of `Object`. (e.g. arrays, functions, objects, regexes, `new Number(0)`, and `new String('')`)
+ *
+ * @static
+ * @memberOf _
+ * @since 0.1.0
+ * @category Lang
+ * @param {*} value The value to check.
+ * @returns {boolean} Returns `true` if `value` is an object, else `false`.
+ * @example
+ *
+ * _.isObject({});
+ * // => true
+ *
+ * _.isObject([1, 2, 3]);
+ * // => true
+ *
+ * _.isObject(_.noop);
+ * // => true
+ *
+ * _.isObject(null);
+ * // => false
+ */
+function isObject(value) {
+  var type = typeof value;
+  return value != null && (type == 'object' || type == 'function');
+}
+
+/* eslint-disable */
+
+/** Used as references for various `Number` constants. */
+var NAN = 0 / 0;
+
+/** Used to detect bad signed hexadecimal string values. */
+var reIsBadHex = /^[-+]0x[0-9a-f]+$/i;
+
+/** Used to detect binary string values. */
+var reIsBinary = /^0b[01]+$/i;
+
+/** Used to detect octal string values. */
+var reIsOctal = /^0o[0-7]+$/i;
+
+/** Built-in method references without a dependency on `root`. */
+var freeParseInt = parseInt;
+
+/**
+ * Converts `value` to a number.
+ *
+ * @static
+ * @memberOf _
+ * @since 4.0.0
+ * @category Lang
+ * @param {*} value The value to process.
+ * @returns {number} Returns the number.
+ * @example
+ *
+ * _.toNumber(3.2);
+ * // => 3.2
+ *
+ * _.toNumber(Number.MIN_VALUE);
+ * // => 5e-324
+ *
+ * _.toNumber(Infinity);
+ * // => Infinity
+ *
+ * _.toNumber('3.2');
+ * // => 3.2
+ */
+function toNumber(value) {
+  if (typeof value == 'number') {
+    return value;
+  }
+  if (isSymbol(value)) {
+    return NAN;
+  }
+  if (isObject(value)) {
+    var other = typeof value.valueOf == 'function' ? value.valueOf() : value;
+    value = isObject(other) ? (other + '') : other;
+  }
+  if (typeof value != 'string') {
+    return value === 0 ? value : +value;
+  }
+  value = baseTrim(value);
+  var isBinary = reIsBinary.test(value);
+  return (isBinary || reIsOctal.test(value))
+    ? freeParseInt(value.slice(2), isBinary ? 2 : 8)
+    : (reIsBadHex.test(value) ? NAN : +value);
+}
+
+/* eslint-disable */
+
+/**
+ * Gets the timestamp of the number of milliseconds that have elapsed since
+ * the Unix epoch (1 January 1970 00:00:00 UTC).
+ *
+ * @static
+ * @memberOf _
+ * @since 2.4.0
+ * @category Date
+ * @returns {number} Returns the timestamp.
+ * @example
+ *
+ * _.defer(function(stamp) {
+ *   console.log(_.now() - stamp);
+ * }, _.now());
+ * // => Logs the number of milliseconds it took for the deferred invocation.
+ */
+var now = function() {
+  return root.Date.now();
+};
+
+/* eslint-disable */
+
+/** Error message constants. */
+var FUNC_ERROR_TEXT$1 = 'Expected a function';
+
+/* Built-in method references for those with the same name as other `lodash` methods. */
+var nativeMax = Math.max,
+    nativeMin = Math.min;
+
+/**
+ * Creates a debounced function that delays invoking `func` until after `wait`
+ * milliseconds have elapsed since the last time the debounced function was
+ * invoked. The debounced function comes with a `cancel` method to cancel
+ * delayed `func` invocations and a `flush` method to immediately invoke them.
+ * Provide `options` to indicate whether `func` should be invoked on the
+ * leading and/or trailing edge of the `wait` timeout. The `func` is invoked
+ * with the last arguments provided to the debounced function. Subsequent
+ * calls to the debounced function return the result of the last `func`
+ * invocation.
+ *
+ * **Note:** If `leading` and `trailing` options are `true`, `func` is
+ * invoked on the trailing edge of the timeout only if the debounced function
+ * is invoked more than once during the `wait` timeout.
+ *
+ * If `wait` is `0` and `leading` is `false`, `func` invocation is deferred
+ * until to the next tick, similar to `setTimeout` with a timeout of `0`.
+ *
+ * See [David Corbacho's article](https://css-tricks.com/debouncing-throttling-explained-examples/)
+ * for details over the differences between `_.debounce` and `_.throttle`.
+ *
+ * @static
+ * @memberOf _
+ * @since 0.1.0
+ * @category Function
+ * @param {Function} func The function to debounce.
+ * @param {number} [wait=0] The number of milliseconds to delay.
+ * @param {Object} [options={}] The options object.
+ * @param {boolean} [options.leading=false]
+ *  Specify invoking on the leading edge of the timeout.
+ * @param {number} [options.maxWait]
+ *  The maximum time `func` is allowed to be delayed before it's invoked.
+ * @param {boolean} [options.trailing=true]
+ *  Specify invoking on the trailing edge of the timeout.
+ * @returns {Function} Returns the new debounced function.
+ * @example
+ *
+ * // Avoid costly calculations while the window size is in flux.
+ * jQuery(window).on('resize', _.debounce(calculateLayout, 150));
+ *
+ * // Invoke `sendMail` when clicked, debouncing subsequent calls.
+ * jQuery(element).on('click', _.debounce(sendMail, 300, {
+ *   'leading': true,
+ *   'trailing': false
+ * }));
+ *
+ * // Ensure `batchLog` is invoked once after 1 second of debounced calls.
+ * var debounced = _.debounce(batchLog, 250, { 'maxWait': 1000 });
+ * var source = new EventSource('/stream');
+ * jQuery(source).on('message', debounced);
+ *
+ * // Cancel the trailing debounced invocation.
+ * jQuery(window).on('popstate', debounced.cancel);
+ */
+function debounce(func, wait, options) {
+  var lastArgs,
+      lastThis,
+      maxWait,
+      result,
+      timerId,
+      lastCallTime,
+      lastInvokeTime = 0,
+      leading = false,
+      maxing = false,
+      trailing = true;
+
+  if (typeof func != 'function') {
+    throw new TypeError(FUNC_ERROR_TEXT$1);
+  }
+  wait = toNumber(wait) || 0;
+  if (isObject(options)) {
+    leading = !!options.leading;
+    maxing = 'maxWait' in options;
+    maxWait = maxing ? nativeMax(toNumber(options.maxWait) || 0, wait) : maxWait;
+    trailing = 'trailing' in options ? !!options.trailing : trailing;
+  }
+
+  function invokeFunc(time) {
+    var args = lastArgs,
+        thisArg = lastThis;
+
+    lastArgs = lastThis = undefined;
+    lastInvokeTime = time;
+    result = func.apply(thisArg, args);
+    return result;
+  }
+
+  function leadingEdge(time) {
+    // Reset any `maxWait` timer.
+    lastInvokeTime = time;
+    // Start the timer for the trailing edge.
+    timerId = setTimeout(timerExpired, wait);
+    // Invoke the leading edge.
+    return leading ? invokeFunc(time) : result;
+  }
+
+  function remainingWait(time) {
+    var timeSinceLastCall = time - lastCallTime,
+        timeSinceLastInvoke = time - lastInvokeTime,
+        timeWaiting = wait - timeSinceLastCall;
+
+    return maxing
+      ? nativeMin(timeWaiting, maxWait - timeSinceLastInvoke)
+      : timeWaiting;
+  }
+
+  function shouldInvoke(time) {
+    var timeSinceLastCall = time - lastCallTime,
+        timeSinceLastInvoke = time - lastInvokeTime;
+
+    // Either this is the first call, activity has stopped and we're at the
+    // trailing edge, the system time has gone backwards and we're treating
+    // it as the trailing edge, or we've hit the `maxWait` limit.
+    return (lastCallTime === undefined || (timeSinceLastCall >= wait) ||
+      (timeSinceLastCall < 0) || (maxing && timeSinceLastInvoke >= maxWait));
+  }
+
+  function timerExpired() {
+    var time = now();
+    if (shouldInvoke(time)) {
+      return trailingEdge(time);
+    }
+    // Restart the timer.
+    timerId = setTimeout(timerExpired, remainingWait(time));
+  }
+
+  function trailingEdge(time) {
+    timerId = undefined;
+
+    // Only invoke if we have `lastArgs` which means `func` has been
+    // debounced at least once.
+    if (trailing && lastArgs) {
+      return invokeFunc(time);
+    }
+    lastArgs = lastThis = undefined;
+    return result;
+  }
+
+  function cancel() {
+    if (timerId !== undefined) {
+      clearTimeout(timerId);
+    }
+    lastInvokeTime = 0;
+    lastArgs = lastCallTime = lastThis = timerId = undefined;
+  }
+
+  function flush() {
+    return timerId === undefined ? result : trailingEdge(now());
+  }
+
+  function debounced() {
+    var time = now(),
+        isInvoking = shouldInvoke(time);
+
+    lastArgs = arguments;
+    lastThis = this;
+    lastCallTime = time;
+
+    if (isInvoking) {
+      if (timerId === undefined) {
+        return leadingEdge(lastCallTime);
+      }
+      if (maxing) {
+        // Handle invocations in a tight loop.
+        clearTimeout(timerId);
+        timerId = setTimeout(timerExpired, wait);
+        return invokeFunc(lastCallTime);
+      }
+    }
+    if (timerId === undefined) {
+      timerId = setTimeout(timerExpired, wait);
+    }
+    return result;
+  }
+  debounced.cancel = cancel;
+  debounced.flush = flush;
+  return debounced;
+}
+
+/* eslint-disable */
+
+/** Error message constants. */
+var FUNC_ERROR_TEXT = 'Expected a function';
+
+/**
+ * Creates a throttled function that only invokes `func` at most once per
+ * every `wait` milliseconds. The throttled function comes with a `cancel`
+ * method to cancel delayed `func` invocations and a `flush` method to
+ * immediately invoke them. Provide `options` to indicate whether `func`
+ * should be invoked on the leading and/or trailing edge of the `wait`
+ * timeout. The `func` is invoked with the last arguments provided to the
+ * throttled function. Subsequent calls to the throttled function return the
+ * result of the last `func` invocation.
+ *
+ * **Note:** If `leading` and `trailing` options are `true`, `func` is
+ * invoked on the trailing edge of the timeout only if the throttled function
+ * is invoked more than once during the `wait` timeout.
+ *
+ * If `wait` is `0` and `leading` is `false`, `func` invocation is deferred
+ * until to the next tick, similar to `setTimeout` with a timeout of `0`.
+ *
+ * See [David Corbacho's article](https://css-tricks.com/debouncing-throttling-explained-examples/)
+ * for details over the differences between `_.throttle` and `_.debounce`.
+ *
+ * @static
+ * @memberOf _
+ * @since 0.1.0
+ * @category Function
+ * @param {Function} func The function to throttle.
+ * @param {number} [wait=0] The number of milliseconds to throttle invocations to.
+ * @param {Object} [options={}] The options object.
+ * @param {boolean} [options.leading=true]
+ *  Specify invoking on the leading edge of the timeout.
+ * @param {boolean} [options.trailing=true]
+ *  Specify invoking on the trailing edge of the timeout.
+ * @returns {Function} Returns the new throttled function.
+ * @example
+ *
+ * // Avoid excessively updating the position while scrolling.
+ * jQuery(window).on('scroll', _.throttle(updatePosition, 100));
+ *
+ * // Invoke `renewToken` when the click event is fired, but not more than once every 5 minutes.
+ * var throttled = _.throttle(renewToken, 300000, { 'trailing': false });
+ * jQuery(element).on('click', throttled);
+ *
+ * // Cancel the trailing throttled invocation.
+ * jQuery(window).on('popstate', throttled.cancel);
+ */
+function throttle(func, wait, options) {
+  var leading = true,
+      trailing = true;
+
+  if (typeof func != 'function') {
+    throw new TypeError(FUNC_ERROR_TEXT);
+  }
+  if (isObject(options)) {
+    leading = 'leading' in options ? !!options.leading : leading;
+    trailing = 'trailing' in options ? !!options.trailing : trailing;
+  }
+  return debounce(func, wait, {
+    'leading': leading,
+    'maxWait': wait,
+    'trailing': trailing
+  });
+}
+
+export { debounce, throttle };
diff --git a/src/routes/_thirdparty/lodash/timers.src.js b/src/routes/_thirdparty/lodash/timers.src.js
new file mode 100644
index 00000000..6da0ff77
--- /dev/null
+++ b/src/routes/_thirdparty/lodash/timers.src.js
@@ -0,0 +1 @@
+export { debounce, throttle } from 'lodash-es'
diff --git a/src/routes/_thirdparty/quick-lru/quick-lru.js b/src/routes/_thirdparty/quick-lru/quick-lru.js
index def21406..d3db7517 100644
--- a/src/routes/_thirdparty/quick-lru/quick-lru.js
+++ b/src/routes/_thirdparty/quick-lru/quick-lru.js
@@ -1,7 +1,8 @@
 // Forked from https://github.com/sindresorhus/quick-lru/blob/16d15d470a8eb87c2a7dd5b80892d9b74f1acd3c/index.js
 // Adds the ability to listen for 'evict' events using an EventEmitter, also removes some unused code
 
-import { EventEmitter } from 'events-light'
+import eventsLightPackage from 'events-light'
+const { EventEmitter } = eventsLightPackage
 
 export class QuickLRU extends EventEmitter {
   constructor (options = {}) {
diff --git a/src/routes/_thirdparty/timeago/timeago.js b/src/routes/_thirdparty/timeago/timeago.js
index 0c8c4ac7..a7f3caaa 100644
--- a/src/routes/_thirdparty/timeago/timeago.js
+++ b/src/routes/_thirdparty/timeago/timeago.js
@@ -1,6 +1,6 @@
 // adapted from https://unpkg.com/timeago.js@4.0.0-beta.1/lib/index.js
-import { LOCALE } from '../../_static/intl'
-import { thunk } from '../../_utils/thunk'
+import { LOCALE } from '../../_static/intl.js'
+import { thunk } from '../../_utils/thunk.js'
 
 const IndexMapEn = ['second', 'minute', 'hour', 'day', 'week', 'month', 'year']
 const SEC_ARRAY = [60, 60, 24, 7, 365 / 7 / 12, 12]
@@ -9,7 +9,7 @@ const intlFormat = thunk(() => new Intl.RelativeTimeFormat(LOCALE))
 function formatRelativeTime (number, index) {
   if (index === 0) {
     if (process.env.NODE_ENV === 'test') {
-      return require('../../../intl/en-US').default.justNow // only used in mocha tests
+      return 'just now' // only used in mocha tests
     }
     return 'intl.justNow'
   }
diff --git a/src/routes/_thirdparty/unescape/unescape.js b/src/routes/_thirdparty/unescape/unescape.js
index 96b5dc40..66504b20 100644
--- a/src/routes/_thirdparty/unescape/unescape.js
+++ b/src/routes/_thirdparty/unescape/unescape.js
@@ -1,7 +1,7 @@
 //
 // Originally via https://github.com/jonschlinkert/unescape/blob/98d1e52/index.js
 //
-import { thunk } from '../../_utils/thunk'
+import { thunk } from '../../_utils/thunk.js'
 
 // via https://www.htmlhelp.com/reference/html40/entities/special.html
 // plus some more known entities like pound, nbsp, etc
diff --git a/src/routes/_thirdparty/websocket/websocket.js b/src/routes/_thirdparty/websocket/websocket.js
index 063cb063..c20def11 100644
--- a/src/routes/_thirdparty/websocket/websocket.js
+++ b/src/routes/_thirdparty/websocket/websocket.js
@@ -1,6 +1,6 @@
 // forked from https://github.com/gamestdio/websocket/blob/4111bfa/src/index.js
 
-import { Backoff } from './backoff'
+import { Backoff } from './backoff.js'
 
 export class WebSocketClient {
   /**
diff --git a/src/routes/_transitions/slide.js b/src/routes/_transitions/slide.js
index 0219d298..99a75cae 100644
--- a/src/routes/_transitions/slide.js
+++ b/src/routes/_transitions/slide.js
@@ -1,6 +1,6 @@
 import { slide as svelteSlide } from 'svelte-transitions'
-import { store } from '../_store/store'
-import noop from 'lodash-es/noop'
+import { store } from '../_store/store.js'
+import { noop } from '../_utils/lodash-lite.js'
 
 // same as svelte-transitions, but respecting reduceMotion
 export function slide (node, ref) {
diff --git a/src/routes/_utils/RealmStore.js b/src/routes/_utils/RealmStore.js
index 13bef91b..0eff6db4 100644
--- a/src/routes/_utils/RealmStore.js
+++ b/src/routes/_utils/RealmStore.js
@@ -1,10 +1,12 @@
 // A store where you can divide data into "realms" that are backed with an LRU cache.
 // Each realm has self-contained data that you can set with setForRealm() and compute
 // with computeForRealm(). The maxSize determines how many realms to keep in the LRU cache.
-import { Store } from 'svelte/store.js'
-import { QuickLRU } from '../_thirdparty/quick-lru/quick-lru'
-import { mark, stop } from './marks'
-import { requestPostAnimationFrame } from './requestPostAnimationFrame'
+import { QuickLRU } from '../_thirdparty/quick-lru/quick-lru.js'
+import { mark, stop } from './marks.js'
+import { requestPostAnimationFrame } from './requestPostAnimationFrame.js'
+import * as storePackage from 'svelte/store.umd.js'
+
+const { Store } = storePackage
 
 export class RealmStore extends Store {
   constructor (init, maxSize) {
diff --git a/src/routes/_utils/RequestThrottler.js b/src/routes/_utils/RequestThrottler.js
index 7c90df80..657fc2aa 100644
--- a/src/routes/_utils/RequestThrottler.js
+++ b/src/routes/_utils/RequestThrottler.js
@@ -1,5 +1,5 @@
 // Throttle network requests to be a good citizen and not issue an HTTP request on every keystroke
-import { PromiseThrottler } from './PromiseThrottler'
+import { PromiseThrottler } from './PromiseThrottler.js'
 
 const promiseThrottler = new PromiseThrottler(200) // Mastodon FE also uses 200ms
 
diff --git a/src/routes/_utils/addEmojiTooltips.js b/src/routes/_utils/addEmojiTooltips.js
index c3877ac4..ec10a085 100644
--- a/src/routes/_utils/addEmojiTooltips.js
+++ b/src/routes/_utils/addEmojiTooltips.js
@@ -1,4 +1,4 @@
-import * as emojiDatabase from './emojiDatabase'
+import * as emojiDatabase from './emojiDatabase.js'
 
 // Add a nice little tooltip to native emoji showing the shortcodes you can type to search for them
 // TODO: titles are not accessible to keyboard users or touch users, and also they don't show up
diff --git a/src/routes/_utils/blurhash.js b/src/routes/_utils/blurhash.js
index 9d16978e..bba67e4e 100644
--- a/src/routes/_utils/blurhash.js
+++ b/src/routes/_utils/blurhash.js
@@ -1,7 +1,7 @@
-import BlurhashWorker from '../_workers/blurhash'
+import BlurhashWorker from '../_workers/blurhash.js'
 import PromiseWorker from 'promise-worker'
-import { BLURHASH_RESOLUTION as RESOLUTION } from '../_static/blurhash'
-import { QuickLRU } from '../_thirdparty/quick-lru/quick-lru'
+import { BLURHASH_RESOLUTION as RESOLUTION } from '../_static/blurhash.js'
+import { QuickLRU } from '../_thirdparty/quick-lru/quick-lru.js'
 
 // A timeline will typically show 20-30 articles at once in the virtual list. The maximum number
 // of sensitive images per article is 4. 30*4=120, so this is a very conservative number.
diff --git a/src/routes/_utils/computeFilterContextsForStatusOrNotification.js b/src/routes/_utils/computeFilterContextsForStatusOrNotification.js
index b84090ed..45c44a8a 100644
--- a/src/routes/_utils/computeFilterContextsForStatusOrNotification.js
+++ b/src/routes/_utils/computeFilterContextsForStatusOrNotification.js
@@ -1,4 +1,4 @@
-import { createSearchIndexFromStatusOrNotification } from './createSearchIndexFromStatusOrNotification'
+import { createSearchIndexFromStatusOrNotification } from './createSearchIndexFromStatusOrNotification.js'
 
 export function computeFilterContextsForStatusOrNotification (statusOrNotification, contextsToRegex) {
   if (!contextsToRegex || !Object.keys(contextsToRegex).length) {
diff --git a/src/routes/_utils/createAutosuggestAccessibleLabel.js b/src/routes/_utils/createAutosuggestAccessibleLabel.js
index e4eec85b..4a346aef 100644
--- a/src/routes/_utils/createAutosuggestAccessibleLabel.js
+++ b/src/routes/_utils/createAutosuggestAccessibleLabel.js
@@ -1,4 +1,4 @@
-import { removeEmoji } from './removeEmoji'
+import { removeEmoji } from './removeEmoji.js'
 
 export function createAutosuggestAccessibleLabel (
   autosuggestType, $omitEmojiInDisplayNames,
diff --git a/src/routes/_utils/createPriorityQueue.js b/src/routes/_utils/createPriorityQueue.js
index 4e0eb61f..45d1a1f5 100644
--- a/src/routes/_utils/createPriorityQueue.js
+++ b/src/routes/_utils/createPriorityQueue.js
@@ -1,6 +1,6 @@
 // Promise-based implementation that waits a microtask tick
 // and executes the resolve() functions in priority order
-import { queueMicrotask } from './queueMicrotask'
+import { queueMicrotask } from './queueMicrotask.js'
 
 export function createPriorityQueue () {
   const tasks = []
diff --git a/src/routes/_utils/emojiDatabase.js b/src/routes/_utils/emojiDatabase.js
index 5f3b386c..712c6892 100644
--- a/src/routes/_utils/emojiDatabase.js
+++ b/src/routes/_utils/emojiDatabase.js
@@ -1,6 +1,6 @@
-import Database from 'emoji-picker-element/database'
-import { lifecycle } from './lifecycle'
-import { emojiPickerLocale, emojiPickerDataSource } from '../_static/emojiPickerIntl'
+import Database from 'emoji-picker-element/database.js'
+import { lifecycle } from './lifecycle.js'
+import { emojiPickerLocale, emojiPickerDataSource } from '../_static/emojiPickerIntl.js'
 
 let database
 
diff --git a/src/routes/_utils/emojiRegex.js b/src/routes/_utils/emojiRegex.js
index ced53ece..ca25ad9e 100644
--- a/src/routes/_utils/emojiRegex.js
+++ b/src/routes/_utils/emojiRegex.js
@@ -1,4 +1,4 @@
-import emojiRegex from 'emoji-regex/es2015/text'
-import { thunk } from './thunk'
+import emojiRegex from 'emoji-regex/es2015/text.js'
+import { thunk } from './thunk.js'
 
 export const getEmojiRegex = thunk(emojiRegex)
diff --git a/src/routes/_utils/emojifyText.js b/src/routes/_utils/emojifyText.js
index 8e284e9b..f279c2a8 100644
--- a/src/routes/_utils/emojifyText.js
+++ b/src/routes/_utils/emojifyText.js
@@ -1,5 +1,5 @@
-import { replaceAll } from './strings'
-import { replaceEmoji } from './replaceEmoji'
+import { replaceAll } from './strings.js'
+import { replaceEmoji } from './replaceEmoji.js'
 
 export function emojifyText (text, emojis, autoplayGifs) {
   // replace native emoji with wrapped spans so we can give them the proper font-family
diff --git a/src/routes/_utils/eventBus.js b/src/routes/_utils/eventBus.js
index ad5e345b..47e0c48c 100644
--- a/src/routes/_utils/eventBus.js
+++ b/src/routes/_utils/eventBus.js
@@ -1,4 +1,5 @@
-import EventEmitter from 'events-light'
+import eventsLightPackage from 'events-light'
+const { EventEmitter } = eventsLightPackage
 
 export const eventBus = new EventEmitter()
 
diff --git a/src/routes/_utils/events.js b/src/routes/_utils/events.js
index 7d3c94de..6c124038 100644
--- a/src/routes/_utils/events.js
+++ b/src/routes/_utils/events.js
@@ -1,4 +1,4 @@
-import { registerResizeListener, unregisterResizeListener } from './resize'
+import { registerResizeListener, unregisterResizeListener } from './resize.js'
 
 export function mouseover (node, callback) {
   function onMouseEnter () {
diff --git a/src/routes/_utils/forceOnline.js b/src/routes/_utils/forceOnline.js
index 7dce07bd..a88acfa1 100644
--- a/src/routes/_utils/forceOnline.js
+++ b/src/routes/_utils/forceOnline.js
@@ -1,5 +1,5 @@
-import { store } from '../_store/store'
-import { emit } from './eventBus'
+import { store } from '../_store/store.js'
+import { emit } from './eventBus.js'
 
 // Force online/offline state. Needed for integration tests.
 // It would be nice not to actually ship this in production, but *shrug*
diff --git a/src/routes/_utils/formatIntl.js b/src/routes/_utils/formatIntl.js
index 61b6667e..a22dcc22 100644
--- a/src/routes/_utils/formatIntl.js
+++ b/src/routes/_utils/formatIntl.js
@@ -1,6 +1,6 @@
 import interpret from 'format-message-interpret'
-import { LOCALE } from '../_static/intl'
-import { mark, stop } from './marks'
+import { LOCALE } from '../_static/intl.js'
+import { mark, stop } from './marks.js'
 
 function doFormatIntl (ast, values) {
   return interpret(ast, LOCALE)(values).trim().replace(/\s+/g, ' ')
diff --git a/src/routes/_utils/formatters.js b/src/routes/_utils/formatters.js
index cde8368c..49ea0df3 100644
--- a/src/routes/_utils/formatters.js
+++ b/src/routes/_utils/formatters.js
@@ -1,5 +1,5 @@
-import { LOCALE } from '../_static/intl'
-import { thunk } from './thunk'
+import { LOCALE } from '../_static/intl.js'
+import { thunk } from './thunk.js'
 
 export const absoluteDateFormatter = thunk(() => new Intl.DateTimeFormat(LOCALE, {
   year: 'numeric',
diff --git a/src/routes/_utils/getImageNativeDimensions.js b/src/routes/_utils/getImageNativeDimensions.js
index c5defa63..8eb41cea 100644
--- a/src/routes/_utils/getImageNativeDimensions.js
+++ b/src/routes/_utils/getImageNativeDimensions.js
@@ -1,4 +1,4 @@
-import { decodeImage } from './decodeImage'
+import { decodeImage } from './decodeImage.js'
 
 export async function getImageNativeDimensions (url) {
   const img = document.createElement('img')
diff --git a/src/routes/_utils/handleRegex.js b/src/routes/_utils/handleRegex.js
index 0b4fe19e..0cc497ce 100644
--- a/src/routes/_utils/handleRegex.js
+++ b/src/routes/_utils/handleRegex.js
@@ -1,5 +1,5 @@
 /* eslint-disable */
-import { thunk } from './thunk'
+import { thunk } from './thunk.js'
 
 export const handleRegex = thunk(() => /(^|[^\/\w])@(([a-z0-9_]+)@[a-z0-9\.\-]+[a-z0-9]+)/ig)
 /* eslint-enable */
diff --git a/src/routes/_utils/idbReady.js b/src/routes/_utils/idbReady.js
index 091d466a..14d5bd60 100644
--- a/src/routes/_utils/idbReady.js
+++ b/src/routes/_utils/idbReady.js
@@ -1,5 +1,5 @@
 import safariIdbReady from 'safari-14-idb-fix'
-import { isWebKit } from './userAgent/isWebKit'
+import { isWebKit } from './userAgent/isWebKit.js'
 
 // workaround for a safari 14 bug, see https://github.com/jakearchibald/safari-14-idb-fix
 export async function idbReady () {
diff --git a/src/routes/_utils/isDarkTheme.js b/src/routes/_utils/isDarkTheme.js
index b939ffb4..680aef53 100644
--- a/src/routes/_utils/isDarkTheme.js
+++ b/src/routes/_utils/isDarkTheme.js
@@ -1,5 +1,5 @@
-import { themes } from '../_static/themes'
-import { DEFAULT_THEME } from './themeEngine'
+import { themes } from '../_static/themes.js'
+import { DEFAULT_THEME } from './themeEngine.js'
 
 export function isDarkTheme (themeName) {
   const theme = themes.find(_ => _.name === themeName) || themes.find(_ => _.name === DEFAULT_THEME)
diff --git a/src/routes/_utils/lodash-lite.js b/src/routes/_utils/lodash-lite.js
index 0723100c..45f125ed 100644
--- a/src/routes/_utils/lodash-lite.js
+++ b/src/routes/_utils/lodash-lite.js
@@ -44,3 +44,9 @@ export function times (n, func) {
   }
   return res
 }
+
+export function noop () {}
+
+export function cloneDeep (obj) {
+  return JSON.parse(JSON.stringify(obj))
+}
diff --git a/src/routes/_utils/massageUserText.js b/src/routes/_utils/massageUserText.js
index f5e636d3..6e4e755a 100644
--- a/src/routes/_utils/massageUserText.js
+++ b/src/routes/_utils/massageUserText.js
@@ -1,5 +1,5 @@
-import { emojifyText } from './emojifyText'
-import { massageStatusPlainText } from './massageStatusPlainText'
+import { emojifyText } from './emojifyText.js'
+import { massageStatusPlainText } from './massageStatusPlainText.js'
 
 export function massageUserText (text, emojis, $autoplayGifs) {
   text = text || ''
diff --git a/src/routes/_utils/measureText.js b/src/routes/_utils/measureText.js
index 7ac136fd..38d99af0 100644
--- a/src/routes/_utils/measureText.js
+++ b/src/routes/_utils/measureText.js
@@ -1,8 +1,8 @@
 // via https://github.com/tootsuite/mastodon/blob/5d5c0f4/app/javascript/mastodon/features/compose/util/counter.js
 
-import { urlRegex } from './urlRegex'
-import { handleRegex } from './handleRegex'
-import { mark, stop } from './marks'
+import { urlRegex } from './urlRegex.js'
+import { handleRegex } from './handleRegex.js'
+import { mark, stop } from './marks.js'
 import { length } from 'stringz'
 
 const urlPlaceholder = 'xxxxxxxxxxxxxxxxxxxxxxx'
diff --git a/src/routes/_utils/pointerEvents.js b/src/routes/_utils/pointerEvents.js
index 051bcfb8..781b5715 100644
--- a/src/routes/_utils/pointerEvents.js
+++ b/src/routes/_utils/pointerEvents.js
@@ -1,4 +1,4 @@
-import { get } from './lodash-lite'
+import { get } from './lodash-lite.js'
 
 const hasPointerEvents = process.browser && typeof PointerEvent === 'function'
 
diff --git a/src/routes/_utils/polyfills/asyncPolyfills.js b/src/routes/_utils/polyfills/asyncPolyfills.js
index e31cd920..4002d92b 100644
--- a/src/routes/_utils/polyfills/asyncPolyfills.js
+++ b/src/routes/_utils/polyfills/asyncPolyfills.js
@@ -8,32 +8,32 @@ export const importFocusVisible = () => import(
 )
 
 export const importIntlLocale = () => import(
-  /* webpackChunkName: '$polyfill$-internationalization' */ '@formatjs/intl-locale/polyfill'
+  /* webpackChunkName: '$polyfill$-internationalization' */ '@formatjs/intl-locale/polyfill.js'
 )
 
 export const importIntlPluralRules = async () => { // has to be imported serially
   await import(
-    /* webpackChunkName: '$polyfill$-internationalization' */ '@formatjs/intl-pluralrules/polyfill'
+    /* webpackChunkName: '$polyfill$-internationalization' */ '@formatjs/intl-pluralrules/polyfill.js'
   )
   await import(
-    /* webpackChunkName: '$polyfill$-internationalization' */ '@formatjs/intl-pluralrules/locale-data/en'
+    /* webpackChunkName: '$polyfill$-internationalization' */ '@formatjs/intl-pluralrules/locale-data/en.js'
   )
 }
 
 export const importIntlRelativeTimeFormat = async () => { // has to be imported serially
   await import(
-    /* webpackChunkName: '$polyfill$-internationalization' */ '@formatjs/intl-relativetimeformat/polyfill'
+    /* webpackChunkName: '$polyfill$-internationalization' */ '@formatjs/intl-relativetimeformat/polyfill.js'
   )
   await import(
-    /* webpackChunkName: '$polyfill$-internationalization' */ '@formatjs/intl-relativetimeformat/locale-data/en'
+    /* webpackChunkName: '$polyfill$-internationalization' */ '@formatjs/intl-relativetimeformat/locale-data/en.js'
   )
 }
 
 export const importIntlListFormat = async () => { // has to be imported serially
   await import(
-    /* webpackChunkName: '$polyfill$-internationalization' */ '@formatjs/intl-listformat/polyfill'
+    /* webpackChunkName: '$polyfill$-internationalization' */ '@formatjs/intl-listformat/polyfill.js'
   )
   await import(
-    /* webpackChunkName: '$polyfill$-internationalization' */ '@formatjs/intl-listformat/locale-data/en'
+    /* webpackChunkName: '$polyfill$-internationalization' */ '@formatjs/intl-listformat/locale-data/en.js'
   )
 }
diff --git a/src/routes/_utils/polyfills/loadNonCriticalPolyfills.js b/src/routes/_utils/polyfills/loadNonCriticalPolyfills.js
index 354bb2e9..331a680c 100644
--- a/src/routes/_utils/polyfills/loadNonCriticalPolyfills.js
+++ b/src/routes/_utils/polyfills/loadNonCriticalPolyfills.js
@@ -1,5 +1,5 @@
-import { importFocusVisible } from './asyncPolyfills'
-import { supportsFocusVisible } from '../supportsFocusVisible'
+import { importFocusVisible } from './asyncPolyfills.js'
+import { supportsFocusVisible } from '../supportsFocusVisible.js'
 
 export function loadNonCriticalPolyfills () {
   return Promise.all([
diff --git a/src/routes/_utils/polyfills/loadPolyfills.js b/src/routes/_utils/polyfills/loadPolyfills.js
index 7f572d2e..1f1d36b7 100644
--- a/src/routes/_utils/polyfills/loadPolyfills.js
+++ b/src/routes/_utils/polyfills/loadPolyfills.js
@@ -2,8 +2,8 @@ import {
   importIntlListFormat,
   importIntlLocale, importIntlPluralRules, importIntlRelativeTimeFormat,
   importRequestIdleCallback
-} from './asyncPolyfills'
-import { mark, stop } from '../marks'
+} from './asyncPolyfills.js'
+import { mark, stop } from '../marks.js'
 
 async function loadIntlPolyfillsIfNecessary () {
   // Have to chain these so that they load in the proper order.
diff --git a/src/routes/_utils/removeEmoji.js b/src/routes/_utils/removeEmoji.js
index 40e1c664..2da9ca5c 100644
--- a/src/routes/_utils/removeEmoji.js
+++ b/src/routes/_utils/removeEmoji.js
@@ -1,5 +1,5 @@
-import { replaceAll } from './strings'
-import { replaceEmoji } from './replaceEmoji'
+import { replaceAll } from './strings.js'
+import { replaceEmoji } from './replaceEmoji.js'
 
 export function removeEmoji (text, emojis) {
   // remove custom emoji
diff --git a/src/routes/_utils/replaceEmoji.js b/src/routes/_utils/replaceEmoji.js
index 1383cbcc..e1bd06b2 100644
--- a/src/routes/_utils/replaceEmoji.js
+++ b/src/routes/_utils/replaceEmoji.js
@@ -1,4 +1,4 @@
-import { getEmojiRegex } from './emojiRegex'
+import { getEmojiRegex } from './emojiRegex.js'
 
 // \ufe0f is a variation selector, which seems to appear for some reason in e.g. ™
 const NON_EMOJI_REGEX = /^(?:[0-9#*]|™|®|\ufe0f)+$/
diff --git a/src/routes/_utils/reselect.js b/src/routes/_utils/reselect.js
index da21311d..0e9496c0 100644
--- a/src/routes/_utils/reselect.js
+++ b/src/routes/_utils/reselect.js
@@ -3,7 +3,7 @@
 // This avoids the issue where Svelte may keep re-rendering because it doesn't
 // know if an object/array has changed or not.
 
-import isEqual from 'lodash-es/isEqual'
+import { isEqual } from '../_thirdparty/lodash/objects.js'
 
 if (process.browser && process.env.NODE_ENV !== 'production') {
   window.reselectStats = {}
diff --git a/src/routes/_utils/resize.js b/src/routes/_utils/resize.js
index 270cfc0c..678a9ee9 100644
--- a/src/routes/_utils/resize.js
+++ b/src/routes/_utils/resize.js
@@ -1,4 +1,4 @@
-import debounce from 'lodash-es/debounce'
+import { debounce } from '../_thirdparty/lodash/timers.js'
 
 const DEBOUNCE_DELAY = 700
 
diff --git a/src/routes/_utils/runMediumPriorityTask.js b/src/routes/_utils/runMediumPriorityTask.js
index 8322c6b3..98e70b70 100644
--- a/src/routes/_utils/runMediumPriorityTask.js
+++ b/src/routes/_utils/runMediumPriorityTask.js
@@ -1,6 +1,6 @@
-import { scheduleIdleTask } from './scheduleIdleTask'
-import { store } from '../_store/store'
-import { isMobile } from './userAgent/isMobile'
+import { scheduleIdleTask } from './scheduleIdleTask.js'
+import { store } from '../_store/store.js'
+import { isMobile } from './userAgent/isMobile.js'
 
 // Rough guess at whether this is a "mobile" device or not, for the purposes
 // of "device class" estimations
diff --git a/src/routes/_utils/safeLocalStorage.js b/src/routes/_utils/safeLocalStorage.js
index 8cf57e52..0d52a0b3 100644
--- a/src/routes/_utils/safeLocalStorage.js
+++ b/src/routes/_utils/safeLocalStorage.js
@@ -1,5 +1,5 @@
 import localStorageMemory from 'localstorage-memory'
-import { testHasLocalStorage } from './testStorage'
+import { testHasLocalStorage } from './testStorage.js'
 
 const safeLocalStorage = testHasLocalStorage() ? localStorage : localStorageMemory
 
diff --git a/src/routes/_utils/scheduleIdleTask.js b/src/routes/_utils/scheduleIdleTask.js
index 823a872a..6538db66 100644
--- a/src/routes/_utils/scheduleIdleTask.js
+++ b/src/routes/_utils/scheduleIdleTask.js
@@ -3,7 +3,7 @@
 // for a good breakdown of the concepts behind this.
 
 import Queue from 'tiny-queue'
-import { mark, stop } from './marks'
+import { mark, stop } from './marks.js'
 
 const taskQueue = new Queue()
 let runningRequestIdleCallback = false
diff --git a/src/routes/_utils/scheduleInterval.js b/src/routes/_utils/scheduleInterval.js
index 323285cd..5cf4f64f 100644
--- a/src/routes/_utils/scheduleInterval.js
+++ b/src/routes/_utils/scheduleInterval.js
@@ -1,4 +1,4 @@
-import { lifecycle } from './lifecycle'
+import { lifecycle } from './lifecycle.js'
 
 /**
  * Schedule a callback, similar to setInterval but disables itself when the page is not active to save battery/CPU.
diff --git a/src/routes/_utils/scrollIntoView.js b/src/routes/_utils/scrollIntoView.js
index e9ae2950..159cfb52 100644
--- a/src/routes/_utils/scrollIntoView.js
+++ b/src/routes/_utils/scrollIntoView.js
@@ -1,8 +1,8 @@
 import {
   getScrollContainer,
   getOffsetHeight
-} from './scrollContainer'
-import { smoothScroll } from './smoothScroll'
+} from './scrollContainer.js'
+import { smoothScroll } from './smoothScroll.js'
 
 let mainNavElement
 function getTopOverlay () {
diff --git a/src/routes/_utils/scrollToTop.js b/src/routes/_utils/scrollToTop.js
index 790b7db9..154328c5 100644
--- a/src/routes/_utils/scrollToTop.js
+++ b/src/routes/_utils/scrollToTop.js
@@ -1,5 +1,5 @@
-import { getScrollContainer } from './scrollContainer'
-import { smoothScroll } from './smoothScroll'
+import { getScrollContainer } from './scrollContainer.js'
+import { smoothScroll } from './smoothScroll.js'
 
 export function scrollToTop (smooth) {
   const scroller = getScrollContainer()
diff --git a/src/routes/_utils/serviceWorkerClient.js b/src/routes/_utils/serviceWorkerClient.js
index a95115f2..0fccdf1a 100644
--- a/src/routes/_utils/serviceWorkerClient.js
+++ b/src/routes/_utils/serviceWorkerClient.js
@@ -1,4 +1,4 @@
-import { snackbar } from '../_components/snackbar/snackbar'
+import { snackbar } from '../_components/snackbar/snackbar.js'
 
 async function skipWaiting () {
   const reg = await navigator.serviceWorker.getRegistration()
diff --git a/src/routes/_utils/shortcuts.js b/src/routes/_utils/shortcuts.js
index ed39ecc3..5c420993 100644
--- a/src/routes/_utils/shortcuts.js
+++ b/src/routes/_utils/shortcuts.js
@@ -1,4 +1,4 @@
-import { store } from '../_store/store'
+import { store } from '../_store/store.js'
 
 // A map of scopeKey to KeyMap
 let scopeKeyMaps
diff --git a/src/routes/_utils/smoothScroll.js b/src/routes/_utils/smoothScroll.js
index 1b78f5f7..53d627ba 100644
--- a/src/routes/_utils/smoothScroll.js
+++ b/src/routes/_utils/smoothScroll.js
@@ -1,5 +1,5 @@
-import { store } from '../_store/store'
-import { isChrome } from './userAgent/isChrome'
+import { store } from '../_store/store.js'
+import { isChrome } from './userAgent/isChrome.js'
 
 // via https://github.com/tootsuite/mastodon/blob/f59ed3a4fafab776b4eeb92f805dfe1fecc17ee3/app/javascript/mastodon/scroll.js
 const easingOutQuint = (x, t, b, c, d) =>
diff --git a/src/routes/_utils/sortItemSummariesForThread.js b/src/routes/_utils/sortItemSummariesForThread.js
index 90af5ba2..89ca28a7 100644
--- a/src/routes/_utils/sortItemSummariesForThread.js
+++ b/src/routes/_utils/sortItemSummariesForThread.js
@@ -1,9 +1,9 @@
 // This is designed to exactly mimic Mastodon's ordering for threads. As described by Gargron:
 // "statuses are ordered in the postgresql query and then any of OP's self-replies bubble to the top"
 // Source: https://github.com/tootsuite/mastodon/blob/ef15246/app/models/concerns/status_threading_concern.rb
-import { concat } from './arrays'
-import { compareTimelineItemSummaries } from './statusIdSorting'
-import { mapBy, multimapBy } from './maps'
+import { concat } from './arrays.js'
+import { compareTimelineItemSummaries } from './statusIdSorting.js'
+import { mapBy, multimapBy } from './maps.js'
 
 export function sortItemSummariesForThread (summaries, statusId) {
   const ancestors = []
diff --git a/src/routes/_utils/statusHtmlToPlainText.js b/src/routes/_utils/statusHtmlToPlainText.js
index ddee61a5..ab390cdb 100644
--- a/src/routes/_utils/statusHtmlToPlainText.js
+++ b/src/routes/_utils/statusHtmlToPlainText.js
@@ -1,5 +1,5 @@
-import { mark, stop } from './marks'
-import { massageStatusPlainText } from './massageStatusPlainText'
+import { mark, stop } from './marks.js'
+import { massageStatusPlainText } from './massageStatusPlainText.js'
 
 const domParser = process.browser && new DOMParser()
 
diff --git a/src/routes/_utils/statusIdSorting.js b/src/routes/_utils/statusIdSorting.js
index 427fca2e..19f2d436 100644
--- a/src/routes/_utils/statusIdSorting.js
+++ b/src/routes/_utils/statusIdSorting.js
@@ -2,7 +2,7 @@
 // Using base62 for both works, since the first 10 characters of base62
 // are 0-9.
 
-import { padStart } from './lodash-lite'
+import { padStart } from './lodash-lite.js'
 
 // Pleroma uses the 0-9A-Za-z alphabet for base62, which is the same as ASCII, which
 // is the same as JavaScript sort order and IndexedDB order.
diff --git a/src/routes/_utils/supportsFocusVisible.js b/src/routes/_utils/supportsFocusVisible.js
index 3d8c428b..fa99878b 100644
--- a/src/routes/_utils/supportsFocusVisible.js
+++ b/src/routes/_utils/supportsFocusVisible.js
@@ -1,6 +1,6 @@
-import { thunk } from './thunk'
-import { supportsSelector } from './supportsSelector'
-import { isFirefox } from './userAgent/isFirefox'
+import { thunk } from './thunk.js'
+import { supportsSelector } from './supportsSelector.js'
+import { isFirefox } from './userAgent/isFirefox.js'
 
 // Disabling for now in Firefox due to bugs:
 // https://bugzilla.mozilla.org/show_bug.cgi?id=1699154
diff --git a/src/routes/_utils/testEmojiSupported.js b/src/routes/_utils/testEmojiSupported.js
index 3873191f..12f70b69 100644
--- a/src/routes/_utils/testEmojiSupported.js
+++ b/src/routes/_utils/testEmojiSupported.js
@@ -1,5 +1,5 @@
 import { isEmojiSupported, setCacheHandler } from 'is-emoji-supported'
-import { QuickLRU } from '../_thirdparty/quick-lru/quick-lru'
+import { QuickLRU } from '../_thirdparty/quick-lru/quick-lru.js'
 
 // avoid recomputing emoji support over and over again
 // use our own LRU since the built-in one grows forever, which is a small memory leak, but still
diff --git a/src/routes/_utils/testStorage.js b/src/routes/_utils/testStorage.js
index 36bde6d6..76d7f78f 100644
--- a/src/routes/_utils/testStorage.js
+++ b/src/routes/_utils/testStorage.js
@@ -1,7 +1,7 @@
 // LocalStorage and IDB may be disabled in private mode, when "blocking cookies" in Safari,
 // or other cases
 
-import { thunk } from './thunk'
+import { thunk } from './thunk.js'
 
 const testKey = '__test__'
 
diff --git a/src/routes/_utils/timelineItemToSummary.js b/src/routes/_utils/timelineItemToSummary.js
index 42d84f01..fc17342a 100644
--- a/src/routes/_utils/timelineItemToSummary.js
+++ b/src/routes/_utils/timelineItemToSummary.js
@@ -1,5 +1,5 @@
-import { computeFilterContextsForStatusOrNotification } from './computeFilterContextsForStatusOrNotification'
-import { store } from '../_store/store'
+import { computeFilterContextsForStatusOrNotification } from './computeFilterContextsForStatusOrNotification.js'
+import { store } from '../_store/store.js'
 
 class TimelineSummary {
   constructor (item, instanceName) {
diff --git a/src/routes/_utils/tryToFocusElement.js b/src/routes/_utils/tryToFocusElement.js
index 2530ad05..7a0739aa 100644
--- a/src/routes/_utils/tryToFocusElement.js
+++ b/src/routes/_utils/tryToFocusElement.js
@@ -1,5 +1,5 @@
 // try 5 times to wait for the element to be rendered and then focus it
-import { scheduleIdleTask } from './scheduleIdleTask'
+import { scheduleIdleTask } from './scheduleIdleTask.js'
 
 const RETRIES = 5
 const TIMEOUT = 50
diff --git a/src/routes/_utils/urlRegex.js b/src/routes/_utils/urlRegex.js
index 1271cb5e..1885ea97 100644
--- a/src/routes/_utils/urlRegex.js
+++ b/src/routes/_utils/urlRegex.js
@@ -1,4 +1,4 @@
-import { thunk } from './thunk'
+import { thunk } from './thunk.js'
 
 export const urlRegex = thunk(() => {
   // this is provided at build time to avoid having a lot of runtime code just to build
diff --git a/src/routes/_utils/urlRegexSource.js b/src/routes/_utils/urlRegexSource.js
index b4d6b68b..2c036dd3 100644
--- a/src/routes/_utils/urlRegexSource.js
+++ b/src/routes/_utils/urlRegexSource.js
@@ -2,7 +2,7 @@
 
 /* eslint-disable */
 
-module.exports = () => {
+export default () => {
   const regexen = {};
 
   const regexSupplant = function(regex, flags) {
diff --git a/src/routes/_utils/userAgent/isChrome.js b/src/routes/_utils/userAgent/isChrome.js
index 75f2245b..09c6f5b5 100644
--- a/src/routes/_utils/userAgent/isChrome.js
+++ b/src/routes/_utils/userAgent/isChrome.js
@@ -1,3 +1,3 @@
-import { thunk } from '../thunk'
+import { thunk } from '../thunk.js'
 
 export const isChrome = thunk(() => process.browser && /Chrome/.test(navigator.userAgent))
diff --git a/src/routes/_utils/userAgent/isChromePre82.js b/src/routes/_utils/userAgent/isChromePre82.js
index d3670204..ffff2329 100644
--- a/src/routes/_utils/userAgent/isChromePre82.js
+++ b/src/routes/_utils/userAgent/isChromePre82.js
@@ -1,8 +1,8 @@
 // checking for Chrome 82 because that's when this bug was fixed
 // https://bugs.chromium.org/p/chromium/issues/detail?id=1053477
 
-import { thunk } from '../thunk'
-import { isChrome } from './isChrome'
+import { thunk } from '../thunk.js'
+import { isChrome } from './isChrome.js'
 
 function getChromeVersion () {
   try {
diff --git a/src/routes/_utils/userAgent/isChromePre87.js b/src/routes/_utils/userAgent/isChromePre87.js
index 50a15909..d08cbb54 100644
--- a/src/routes/_utils/userAgent/isChromePre87.js
+++ b/src/routes/_utils/userAgent/isChromePre87.js
@@ -1,5 +1,5 @@
-import { isChrome } from './isChrome'
-import { thunk } from '../thunk'
+import { isChrome } from './isChrome.js'
+import { thunk } from '../thunk.js'
 
 // https://caniuse.com/cookie-store-api
 export const isChromePre87 = thunk(() => (process.browser && isChrome() && typeof cookieStore === 'undefined'))
diff --git a/src/routes/_utils/userAgent/isFirefox.js b/src/routes/_utils/userAgent/isFirefox.js
index af315343..4fe8745b 100644
--- a/src/routes/_utils/userAgent/isFirefox.js
+++ b/src/routes/_utils/userAgent/isFirefox.js
@@ -1,4 +1,4 @@
-import { thunk } from '../thunk'
+import { thunk } from '../thunk.js'
 
 export const isFirefox = thunk(() => {
   return process.browser && typeof InstallTrigger !== 'undefined' // https://stackoverflow.com/a/9851769/680742
diff --git a/src/routes/_utils/userAgent/isIOS.js b/src/routes/_utils/userAgent/isIOS.js
index e4d71580..bcaa41f0 100644
--- a/src/routes/_utils/userAgent/isIOS.js
+++ b/src/routes/_utils/userAgent/isIOS.js
@@ -1,3 +1,3 @@
-import { thunk } from '../thunk'
+import { thunk } from '../thunk.js'
 
 export const isIOS = thunk(() => process.browser && /iP(?:hone|ad|od)/.test(navigator.userAgent))
diff --git a/src/routes/_utils/userAgent/isIOSPre12Point2.js b/src/routes/_utils/userAgent/isIOSPre12Point2.js
index 4242e35c..959816fe 100644
--- a/src/routes/_utils/userAgent/isIOSPre12Point2.js
+++ b/src/routes/_utils/userAgent/isIOSPre12Point2.js
@@ -1,6 +1,6 @@
 // IntersectionObserver introduced in iOS 12.2 https://caniuse.com/#feat=intersectionobserver
-import { thunk } from '../thunk'
-import { isIOS } from '../userAgent/isIOS'
+import { thunk } from '../thunk.js'
+import { isIOS } from './isIOS.js'
 
 export const isIOSPre12Point2 = thunk(() => process.browser && isIOS() &&
   !(typeof IntersectionObserver === 'function' &&
diff --git a/src/routes/_utils/userAgent/isIOSPre13.js b/src/routes/_utils/userAgent/isIOSPre13.js
index 1d7f1462..99f62a7d 100644
--- a/src/routes/_utils/userAgent/isIOSPre13.js
+++ b/src/routes/_utils/userAgent/isIOSPre13.js
@@ -1,6 +1,6 @@
 // PointerEvent introduced in iOS 13 https://caniuse.com/#feat=pointer
-import { thunk } from '../thunk'
-import { isIOS } from '../userAgent/isIOS'
+import { thunk } from '../thunk.js'
+import { isIOS } from '../userAgent/isIOS.js'
 
 export const isIOSPre13 = thunk(() => process.browser && isIOS() &&
   !(typeof PointerEvent === 'function' &&
diff --git a/src/routes/_utils/userAgent/isKaiOS.js b/src/routes/_utils/userAgent/isKaiOS.js
index 9f607f63..91ab8bd8 100644
--- a/src/routes/_utils/userAgent/isKaiOS.js
+++ b/src/routes/_utils/userAgent/isKaiOS.js
@@ -1,3 +1,3 @@
-import { thunk } from '../thunk'
+import { thunk } from '../thunk.js'
 
 export const isKaiOS = thunk(() => process.browser && /KAIOS/.test(navigator.userAgent))
diff --git a/src/routes/_utils/userAgent/isMac.js b/src/routes/_utils/userAgent/isMac.js
index e0852060..cec72a00 100644
--- a/src/routes/_utils/userAgent/isMac.js
+++ b/src/routes/_utils/userAgent/isMac.js
@@ -1,3 +1,3 @@
-import { thunk } from '../thunk'
+import { thunk } from '../thunk.js'
 
 export const isMac = thunk(() => process.browser && /mac/i.test(navigator.platform))
diff --git a/src/routes/_utils/userAgent/isMobile.js b/src/routes/_utils/userAgent/isMobile.js
index 677ca004..4a9cd2f1 100644
--- a/src/routes/_utils/userAgent/isMobile.js
+++ b/src/routes/_utils/userAgent/isMobile.js
@@ -1,3 +1,3 @@
-import { thunk } from '../thunk'
+import { thunk } from '../thunk.js'
 
 export const isMobile = thunk(() => process.browser && navigator.userAgent.match(/(?:iPhone|iPod|iPad|Android|KAIOS)/))
diff --git a/src/routes/_utils/userAgent/isWebKit.js b/src/routes/_utils/userAgent/isWebKit.js
index b790a345..7e7277d4 100644
--- a/src/routes/_utils/userAgent/isWebKit.js
+++ b/src/routes/_utils/userAgent/isWebKit.js
@@ -1,3 +1,3 @@
-import { thunk } from '../thunk'
+import { thunk } from '../thunk.js'
 
 export const isWebKit = thunk(() => process.browser && typeof webkitIndexedDB !== 'undefined')
diff --git a/src/routes/_workers/blurhash.js b/src/routes/_workers/blurhash.js
index 4d139e40..e5fa8266 100644
--- a/src/routes/_workers/blurhash.js
+++ b/src/routes/_workers/blurhash.js
@@ -1,7 +1,7 @@
 import { decode as decodeBlurHash } from 'blurhash'
-import registerPromiseWorker from 'promise-worker/register'
-import { BLURHASH_RESOLUTION as RESOLUTION } from '../_static/blurhash'
-import { isChromePre82 } from '../_utils/userAgent/isChromePre82'
+import registerPromiseWorker from 'promise-worker/register.js'
+import { BLURHASH_RESOLUTION as RESOLUTION } from '../_static/blurhash.js'
+import { isChromePre82 } from '../_utils/userAgent/isChromePre82.js'
 
 // Disabled in Chrome because convertToBlob() is slow
 // https://github.com/nolanlawson/pinafore/issues/1396
diff --git a/src/service-worker.js b/src/service-worker.js
index ecb6f338..e9fd42b8 100644
--- a/src/service-worker.js
+++ b/src/service-worker.js
@@ -3,8 +3,8 @@ import {
   shell as __shell__,
   routes as __routes__
 } from '../__sapper__/service-worker.js'
-import { get, post } from './routes/_utils/ajax'
-import { setWebShareData, closeKeyValIDBConnection } from './routes/_database/webShare'
+import { get, post } from './routes/_utils/ajax.js'
+import { setWebShareData, closeKeyValIDBConnection } from './routes/_database/webShare.js'
 
 const timestamp = process.env.SAPPER_TIMESTAMP
 const ASSETS = `assets_${timestamp}`
diff --git a/tests/indexedDBShims.js b/tests/indexedDBShims.js
index c8b3c7e2..9d27fa15 100644
--- a/tests/indexedDBShims.js
+++ b/tests/indexedDBShims.js
@@ -1,5 +1,5 @@
 import indexedDB from 'fake-indexeddb'
-import IDBKeyRange from 'fake-indexeddb/build/FDBKeyRange'
+import IDBKeyRange from 'fake-indexeddb/build/FDBKeyRange.js'
 
 global.indexedDB = indexedDB
-global.IDBKeyRange = IDBKeyRange
+global.IDBKeyRange = IDBKeyRange.default
diff --git a/tests/loadMedia.cjs b/tests/loadMedia.cjs
new file mode 100644
index 00000000..4b932d35
--- /dev/null
+++ b/tests/loadMedia.cjs
@@ -0,0 +1,13 @@
+const fs = require('fs')
+const path = require('path')
+
+// Have to use CJS so this file can run in TestCafe. Otherwise it's impossible to get __dirname to work in both envs
+const dirname = __dirname
+
+exports.loadMedia = function loadMedia (filename) {
+  const filepath = path.join(dirname, 'images', filename)
+  if (!fs.existsSync(filepath)) {
+    throw new Error('File does not exist: ' + filepath)
+  }
+  return fs.createReadStream(filepath)
+}
diff --git a/tests/serverActions.js b/tests/serverActions.js
index f175fa6d..873352df 100644
--- a/tests/serverActions.js
+++ b/tests/serverActions.js
@@ -8,7 +8,7 @@ import { authorizeFollowRequest, getFollowRequests } from '../src/routes/_api/fo
 import { followAccount, unfollowAccount } from '../src/routes/_api/follow'
 import { updateCredentials } from '../src/routes/_api/updateCredentials'
 import { reblogStatus } from '../src/routes/_api/reblog'
-import { submitMedia } from './submitMedia'
+import { submitMedia } from './submitMedia.js'
 import { voteOnPoll } from '../src/routes/_api/polls'
 import { POLL_EXPIRY_DEFAULT } from '../src/routes/_static/polls'
 import { createList, getLists } from '../src/routes/_api/lists'
diff --git a/tests/submitMedia.js b/tests/submitMedia.js
index 31467085..3a4bef23 100644
--- a/tests/submitMedia.js
+++ b/tests/submitMedia.js
@@ -1,11 +1,11 @@
 import FormData from 'form-data'
-import fs from 'fs'
-import path from 'path'
-import { auth } from '../src/routes/_api/utils'
+import { auth } from '../src/routes/_api/utils.js'
+import * as loadMediaPackage from './loadMedia.cjs'
+const { loadMedia } = loadMediaPackage
 
 export async function submitMedia (accessToken, filename, alt) {
   const form = new FormData()
-  form.append('file', fs.createReadStream(path.join(__dirname, 'images', filename)))
+  form.append('file', loadMedia(filename))
   form.append('description', alt)
   return new Promise((resolve, reject) => {
     form.submit({
@@ -23,7 +23,20 @@ export async function submitMedia (accessToken, filename, alt) {
         data += chunk
       })
 
-      res.on('end', () => resolve(JSON.parse(data)))
+      res.on('error', err => {
+        console.error(err)
+        reject(err)
+      })
+
+      res.on('end', () => {
+        try {
+          const parsed = JSON.parse(data)
+          resolve(parsed)
+        } catch (err) {
+          console.error('Malformed response, expected JSON: ' + data)
+          reject(err)
+        }
+      })
     })
   })
 }
diff --git a/tests/unit/test-database.js b/tests/unit/test-database.mjs
similarity index 94%
rename from tests/unit/test-database.js
rename to tests/unit/test-database.mjs
index 4a515372..b709e27a 100644
--- a/tests/unit/test-database.js
+++ b/tests/unit/test-database.mjs
@@ -1,17 +1,16 @@
 /* global it describe beforeEach afterEach */
 
-import '../indexedDBShims'
+import '../indexedDBShims.js'
 import assert from 'assert'
-import { closeDatabase, deleteDatabase, getDatabase } from '../../src/routes/_database/databaseLifecycle'
-import * as dbApi from '../../src/routes/_database/databaseApis'
-import times from 'lodash-es/times'
-import cloneDeep from 'lodash-es/cloneDeep'
+import { closeDatabase, deleteDatabase, getDatabase } from '../../src/routes/_database/databaseLifecycle.js'
+import * as dbApi from '../../src/routes/_database/databaseApis.js'
+import { cloneDeep, times } from '../../src/routes/_utils/lodash-lite.js'
 import {
   TIMESTAMP, ACCOUNT_ID, STATUS_ID, REBLOG_ID, USERNAME_LOWERCASE,
   CURRENT_TIME, DB_VERSION_CURRENT, DB_VERSION_SEARCH_ACCOUNTS, DB_VERSION_SNOWFLAKE_IDS
-} from '../../src/routes/_database/constants'
-import { cleanup } from '../../src/routes/_database/cleanup'
-import { CLEANUP_TIME_AGO } from '../../src/routes/_static/database'
+} from '../../src/routes/_database/constants.js'
+import { cleanup } from '../../src/routes/_database/cleanup.js'
+import { CLEANUP_TIME_AGO } from '../../src/routes/_static/database.js'
 
 const INSTANCE_NAME = 'localhost:3000'
 
diff --git a/tests/unit/test-emoji.js b/tests/unit/test-emoji.mjs
similarity index 99%
rename from tests/unit/test-emoji.js
rename to tests/unit/test-emoji.mjs
index 25c41480..e3f02521 100644
--- a/tests/unit/test-emoji.js
+++ b/tests/unit/test-emoji.mjs
@@ -1,6 +1,6 @@
 /* global describe, it */
 
-import { replaceEmoji } from '../../src/routes/_utils/replaceEmoji'
+import { replaceEmoji } from '../../src/routes/_utils/replaceEmoji.js'
 import assert from 'assert'
 
 const mindBlown = String.fromCodePoint(0x1F92F)
diff --git a/tests/unit/test-id-sorting.js b/tests/unit/test-id-sorting.mjs
similarity index 99%
rename from tests/unit/test-id-sorting.js
rename to tests/unit/test-id-sorting.mjs
index 172445f7..3731db0e 100644
--- a/tests/unit/test-id-sorting.js
+++ b/tests/unit/test-id-sorting.mjs
@@ -1,8 +1,8 @@
 /* global describe, it */
 
-import { toPaddedBigInt, toReversePaddedBigInt } from '../../src/routes/_utils/statusIdSorting'
+import { toPaddedBigInt, toReversePaddedBigInt } from '../../src/routes/_utils/statusIdSorting.js'
 import assert from 'assert'
-import times from 'lodash-es/times'
+import { times } from '../../src/routes/_utils/lodash-lite.js'
 
 function lt (a, b) {
   assert(a < b, `Failed: ${a} < ${b}`)
diff --git a/tests/unit/test-intl.js b/tests/unit/test-intl.mjs
similarity index 89%
rename from tests/unit/test-intl.js
rename to tests/unit/test-intl.mjs
index 4ab23236..27751a9c 100644
--- a/tests/unit/test-intl.js
+++ b/tests/unit/test-intl.mjs
@@ -3,7 +3,7 @@
 
 /* global describe it */
 
-import enIntl from '../../src/intl/en-US'
+import enIntl from '../../src/intl/en-US.js'
 import globby from 'globby'
 import path from 'path'
 import { promisify } from 'util'
@@ -11,6 +11,7 @@ import fs from 'fs'
 import assert from 'assert'
 
 const readFile = promisify(fs.readFile)
+const __dirname = path.dirname(new URL(import.meta.url).pathname)
 
 describe('test-intl.js', () => {
   it('has no unused intl strings', async () => {
diff --git a/tests/unit/test-measure-text.js b/tests/unit/test-measure-text.mjs
similarity index 99%
rename from tests/unit/test-measure-text.js
rename to tests/unit/test-measure-text.mjs
index 3cdc5422..786c3b81 100644
--- a/tests/unit/test-measure-text.js
+++ b/tests/unit/test-measure-text.mjs
@@ -1,7 +1,7 @@
 /* global describe, it */
 
 import assert from 'assert'
-import { measureText } from '../../src/routes/_utils/measureText'
+import { measureText } from '../../src/routes/_utils/measureText.js'
 
 describe('test-measure-text.js', () => {
   it('measures text correctly', () => {
diff --git a/tests/unit/test-media-cache.js b/tests/unit/test-media-cache.mjs
similarity index 95%
rename from tests/unit/test-media-cache.js
rename to tests/unit/test-media-cache.mjs
index 7612f326..7b8b98ed 100644
--- a/tests/unit/test-media-cache.js
+++ b/tests/unit/test-media-cache.mjs
@@ -1,10 +1,10 @@
 /* global it describe beforeEach */
 
-import '../indexedDBShims'
+import '../indexedDBShims.js'
 import assert from 'assert'
 import {
   getCachedMediaFile, setCachedMediaFile, deleteCachedMediaFile, getAllCachedFileIds, setDeleteCachedMediaFilesAfter, DELETE_AFTER
-} from '../../src/routes/_database/mediaUploadFileCache'
+} from '../../src/routes/_database/mediaUploadFileCache.js'
 
 describe('test-database.js', function () {
   this.timeout(60000)
diff --git a/tests/unit/test-quick-lru.js b/tests/unit/test-quick-lru.mjs
similarity index 98%
rename from tests/unit/test-quick-lru.js
rename to tests/unit/test-quick-lru.mjs
index 7ea8577a..087146d4 100644
--- a/tests/unit/test-quick-lru.js
+++ b/tests/unit/test-quick-lru.mjs
@@ -1,6 +1,6 @@
 /* global describe, it */
 
-import { QuickLRU } from '../../src/routes/_thirdparty/quick-lru/quick-lru'
+import { QuickLRU } from '../../src/routes/_thirdparty/quick-lru/quick-lru.js'
 import assert from 'assert'
 
 describe('test-quick-lru.js', () => {
diff --git a/tests/unit/test-shortcuts.js b/tests/unit/test-shortcuts.mjs
similarity index 99%
rename from tests/unit/test-shortcuts.js
rename to tests/unit/test-shortcuts.mjs
index a71dd3f5..6bf0de75 100644
--- a/tests/unit/test-shortcuts.js
+++ b/tests/unit/test-shortcuts.mjs
@@ -8,7 +8,7 @@ import {
   popShortcutScope,
   pushShortcutScope,
   removeFromShortcutScope
-} from '../../src/routes/_utils/shortcuts'
+} from '../../src/routes/_utils/shortcuts.js'
 import assert from 'assert'
 
 function KeyDownEvent (key) {
diff --git a/tests/unit/test-thread-ordering.js b/tests/unit/test-thread-ordering.mjs
similarity index 99%
rename from tests/unit/test-thread-ordering.js
rename to tests/unit/test-thread-ordering.mjs
index b214a56a..1b3e72c3 100644
--- a/tests/unit/test-thread-ordering.js
+++ b/tests/unit/test-thread-ordering.mjs
@@ -1,6 +1,6 @@
 /* global describe, it */
 import assert from 'assert'
-import { sortItemSummariesForThread } from '../../src/routes/_utils/sortItemSummariesForThread'
+import { sortItemSummariesForThread } from '../../src/routes/_utils/sortItemSummariesForThread.js'
 
 describe('test-thread-ordering.js', () => {
   it('orders a complex thread correctly', () => {
diff --git a/tests/unit/test-timeago.js b/tests/unit/test-timeago.mjs
similarity index 98%
rename from tests/unit/test-timeago.js
rename to tests/unit/test-timeago.mjs
index 6b382bf2..036246da 100644
--- a/tests/unit/test-timeago.js
+++ b/tests/unit/test-timeago.mjs
@@ -1,7 +1,7 @@
 /* global it describe */
 
 import assert from 'assert'
-import { formatTimeagoDate, formatTimeagoFutureDate } from '../../src/routes/_intl/formatTimeagoDate'
+import { formatTimeagoDate, formatTimeagoFutureDate } from '../../src/routes/_intl/formatTimeagoDate.js'
 
 describe('test-timeago.js', () => {
   it('test past date', () => {
diff --git a/tests/unit/test-unescape.js b/tests/unit/test-unescape.mjs
similarity index 99%
rename from tests/unit/test-unescape.js
rename to tests/unit/test-unescape.mjs
index 21cdce3e..9436de24 100644
--- a/tests/unit/test-unescape.js
+++ b/tests/unit/test-unescape.mjs
@@ -1,6 +1,6 @@
 /* global describe, it */
 import assert from 'assert'
-import { unescape } from '../../src/routes/_thirdparty/unescape/unescape'
+import { unescape } from '../../src/routes/_thirdparty/unescape/unescape.js'
 
 describe('test-unescape.js', () => {
   it('unescapes html correctly', () => {
diff --git a/webpack.config.js b/webpack.config.js
deleted file mode 100644
index 925e423a..00000000
--- a/webpack.config.js
+++ /dev/null
@@ -1,9 +0,0 @@
-const client = require('./webpack/client.config')
-const server = require('./webpack/server.config')
-const serviceworker = require('./webpack/service-worker.config')
-
-module.exports = {
-  client,
-  server,
-  serviceworker
-}
diff --git a/webpack/client.config.js b/webpack/client.config.js
index 22161d80..e8c9e77e 100644
--- a/webpack/client.config.js
+++ b/webpack/client.config.js
@@ -1,16 +1,21 @@
-import { DEFAULT_LOCALE, LOCALE } from '../src/routes/_static/intl'
+import { DEFAULT_LOCALE, LOCALE } from '../src/routes/_static/intl.js'
+import path from 'path'
+import webpack from 'webpack'
+import config from 'sapper/config/webpack.js'
+import { BundleAnalyzerPlugin } from 'webpack-bundle-analyzer'
+import terser from './terser.config.js'
+import CircularDependencyPlugin from 'circular-dependency-plugin'
+import { mode, dev, resolve, inlineSvgs } from './shared.config.js'
+import { version } from '../package.json'
 
-const path = require('path')
-const webpack = require('webpack')
-const config = require('sapper/config/webpack.js')
-const BundleAnalyzerPlugin = require('webpack-bundle-analyzer').BundleAnalyzerPlugin
-const LodashModuleReplacementPlugin = require('lodash-webpack-plugin')
-const terser = require('./terser.config')
-const CircularDependencyPlugin = require('circular-dependency-plugin')
-const { mode, dev, resolve, inlineSvgs } = require('./shared.config')
-const { version } = require('../package.json')
+import urlRegex from '../src/routes/_utils/urlRegexSource.js'
+// TODO: make it so we don't have to list these out explicitly
+import fr from '../src/intl/emoji-picker/fr.js'
+import de from '../src/intl/emoji-picker/de.js'
 
-const urlRegex = require('../src/routes/_utils/urlRegexSource.js')()
+const emojiPickerLocales = { fr, de }
+
+const emojiPickerI18n = LOCALE !== DEFAULT_LOCALE && emojiPickerLocales[LOCALE]
 
 const output = Object.assign(config.client.output(), {
   // enables HMR in workers
@@ -19,9 +24,6 @@ const output = Object.assign(config.client.output(), {
   chunkFilename: dev ? '[fullhash]/[id].js' : '[id].[contenthash].[name].js'
 })
 
-const emojiPickerI18n = LOCALE !== DEFAULT_LOCALE &&
-  require(path.join(__dirname, '../src/intl/emoji-picker/', `${LOCALE}.js`)).default
-
 process.on('unhandledRejection', err => {
   // TODO: seems to be a Webpack Bundle Analyzer error we can safely ignore
   if (!err.message.includes('Error: No such label \'done hook\' for WebpackLogger.timeEnd()')) {
@@ -29,7 +31,7 @@ process.on('unhandledRejection', err => {
   }
 })
 
-module.exports = {
+export default {
   entry: config.client.entry(),
   output,
   resolve,
@@ -67,7 +69,7 @@ module.exports = {
         test: /\.js$/,
         exclude: /node_modules/,
         use: {
-          loader: path.join(__dirname, './svelte-intl-loader.js')
+          loader: path.join(__dirname, './svelte-intl-loader.cjs')
         }
       },
       {
@@ -83,7 +85,7 @@ module.exports = {
             }
           },
           {
-            loader: path.join(__dirname, './svelte-intl-loader.js')
+            loader: path.join(__dirname, './svelte-intl-loader.cjs')
           }
         ]
       }
@@ -111,17 +113,12 @@ module.exports = {
       'process.browser': true,
       'process.env.NODE_ENV': JSON.stringify(mode),
       'process.env.INLINE_SVGS': JSON.stringify(inlineSvgs),
-      'process.env.URL_REGEX': urlRegex.toString(),
+      'process.env.URL_REGEX': urlRegex().toString(),
       'process.env.LOCALE': JSON.stringify(LOCALE),
       'process.env.EMOJI_PICKER_I18N': emojiPickerI18n ? JSON.stringify(emojiPickerI18n) : 'undefined',
       'process.env.PINAFORE_VERSION': JSON.stringify(version),
       'process.env.IS_SERVICE_WORKER': 'false'
     }),
-    new webpack.NormalModuleReplacementPlugin(
-      /\/_database\/database\.js$/, // this version plays nicer with IDEs
-      './database.prod.js'
-    ),
-    new LodashModuleReplacementPlugin(),
     new CircularDependencyPlugin({
       exclude: /node_modules/,
       failOnError: true,
diff --git a/webpack/rollup.config.js b/webpack/rollup.config.js
new file mode 100644
index 00000000..0c2cb9b5
--- /dev/null
+++ b/webpack/rollup.config.js
@@ -0,0 +1,34 @@
+import json from '@rollup/plugin-json'
+
+// We have to build this as webpack.config.cjs so that Sapper can require() it correctly,
+// since Sapper is designed to only work with CommonJS
+
+const createConfig = (input) => {
+  return {
+    input,
+    plugins: [
+      json()
+    ],
+    output: {
+      file: input.replace('.js', '.cjs'),
+      format: 'cjs',
+      exports: 'auto'
+    },
+    external: [
+      'cheerio',
+      'circular-dependency-plugin',
+      'format-message-parse',
+      'fs',
+      'path',
+      'sapper/config/webpack.js',
+      'terser-webpack-plugin',
+      'webpack',
+      'webpack-bundle-analyzer'
+    ]
+  }
+}
+
+export default [
+  createConfig('./webpack/webpack.config.js'),
+  createConfig('./webpack/svelte-intl-loader.js')
+]
diff --git a/webpack/server.config.js b/webpack/server.config.js
index 65fa2fbc..60518a19 100644
--- a/webpack/server.config.js
+++ b/webpack/server.config.js
@@ -1,16 +1,16 @@
-import { LOCALE } from '../src/routes/_static/intl'
+import { LOCALE } from '../src/routes/_static/intl.js'
+import path from 'path'
+import webpack from 'webpack'
+import config from 'sapper/config/webpack.js'
+import pkg from '../package.json'
+import { mode, dev, resolve, inlineSvgs } from './shared.config.js'
 
-const path = require('path')
-const webpack = require('webpack')
-const config = require('sapper/config/webpack.js')
-const pkg = require('../package.json')
-const { mode, dev, resolve, inlineSvgs } = require('./shared.config')
-const { version } = require('../package.json')
+const { version } = pkg
 
 // modules that the server should ignore, either because they cause errors or warnings
 // (because they're only used on the client side)
 const NOOP_MODULES = [
-  '../_workers/blurhash',
+  '../_workers/blurhash.js',
   'tesseract.js/dist/worker.min.js',
   'tesseract.js/dist/worker.min.js.map',
   'tesseract.js-core/tesseract-core.wasm',
@@ -22,10 +22,10 @@ const NOOP_MODULES = [
 const serverResolve = JSON.parse(JSON.stringify(resolve))
 serverResolve.alias = serverResolve.alias || {}
 NOOP_MODULES.forEach(mod => {
-  serverResolve.alias[mod] = 'lodash-es/noop'
+  serverResolve.alias[mod] = '@stdlib/utils-noop'
 })
 
-module.exports = {
+export default {
   entry: config.server.entry(),
   output: config.server.output(),
   target: 'node',
@@ -37,7 +37,7 @@ module.exports = {
         test: /\.js$/,
         exclude: /node_modules/,
         use: {
-          loader: path.join(__dirname, './svelte-intl-loader.js')
+          loader: path.join(__dirname, './svelte-intl-loader.cjs')
         }
       },
       {
@@ -54,7 +54,7 @@ module.exports = {
         }
       },
       {
-        loader: path.join(__dirname, './svelte-intl-loader.js')
+        loader: path.join(__dirname, './svelte-intl-loader.cjs')
       }
     ]
   },
diff --git a/webpack/service-worker.config.js b/webpack/service-worker.config.js
index a52ceb34..b231cee0 100644
--- a/webpack/service-worker.config.js
+++ b/webpack/service-worker.config.js
@@ -1,12 +1,12 @@
 import { LOCALE } from '../src/routes/_static/intl'
 import path from 'path'
 
-const config = require('sapper/config/webpack.js')
-const terser = require('./terser.config')
-const webpack = require('webpack')
-const { mode, dev, resolve } = require('./shared.config')
+import config from 'sapper/config/webpack.js'
+import terser from './terser.config'
+import webpack from 'webpack'
+import { mode, dev, resolve } from './shared.config'
 
-module.exports = {
+export default {
   entry: config.serviceworker.entry(),
   output: config.serviceworker.output(),
   resolve,
@@ -26,7 +26,7 @@ module.exports = {
         test: /\.js$/,
         exclude: /node_modules/,
         use: {
-          loader: path.join(__dirname, './svelte-intl-loader.js')
+          loader: path.join(__dirname, './svelte-intl-loader.cjs')
         }
       }
     ]
diff --git a/webpack/shared.config.js b/webpack/shared.config.js
index 72f54f5c..7e0a87bd 100644
--- a/webpack/shared.config.js
+++ b/webpack/shared.config.js
@@ -1,4 +1,4 @@
-const svgs = require('../bin/svgs')
+import svgs from '../bin/svgs.js'
 
 const inlineSvgs = svgs.filter(_ => _.inline).map(_ => `#${_.id}`)
 const mode = process.env.NODE_ENV || 'production'
@@ -10,12 +10,13 @@ const resolve = {
   alias: {
     // All browsers we target support Intl.PluralRules (or it's polyfilled).
     // So format-message-interpret can fall back to that. This file is pretty big (9.83kB) and it's not needed.
-    './plurals': 'lodash-es/noop',
-    'lookup-closest-locale': 'lodash-es/noop' // small, but also not needed
+    './plurals': '@stdlib/utils-noop',
+    'lookup-closest-locale': '@stdlib/utils-noop', // small, but also not needed
+    'svelte/store.umd.js': 'svelte/store.js' // have to use UMD for Mocha, but in Webpack we can use the ESM version
   }
 }
 
-module.exports = {
+export {
   mode,
   dev,
   resolve,
diff --git a/webpack/svelte-intl-loader.js b/webpack/svelte-intl-loader.js
index a77d2028..c0fc1aec 100644
--- a/webpack/svelte-intl-loader.js
+++ b/webpack/svelte-intl-loader.js
@@ -1,7 +1,7 @@
 // Inject intl statements into a Svelte v2 HTML file as well as some JS files like timeago.js
 // We do this for perf reasons, to make the output smaller and avoid needing to have a huge JSON file of translations
 import parse from 'format-message-parse'
-import { getIntl, warningOrError, trimWhitespace } from '../bin/getIntl'
+import { getIntl, warningOrError, trimWhitespace } from '../bin/getIntl.js'
 
 export default function (source) {
   const res = source
@@ -24,7 +24,7 @@ export default function (source) {
       return JSON.stringify(text)
     })
   const match = res.match(/[^(][^']intl\.([\w.]+)/) || res.match(/formatIntl\('([\w.]+)/)
-  if (match) {
+  if (match && match[1] !== 'js') { // don't warn on `import { formatIntl } from 'intl.js'`
     return warningOrError('You probably made a typo with an intl string: ' + match[1])
   }
   return res
diff --git a/webpack/terser.config.js b/webpack/terser.config.js
index aafaffb2..eb5a1120 100644
--- a/webpack/terser.config.js
+++ b/webpack/terser.config.js
@@ -1,7 +1,7 @@
-const TerserWebpackPlugin = require('terser-webpack-plugin')
-const terserOptions = require('../bin/terserOptions')
+import TerserWebpackPlugin from 'terser-webpack-plugin'
+import terserOptions from '../bin/terserOptions'
 
-module.exports = () => new TerserWebpackPlugin({
+export default () => new TerserWebpackPlugin({
   exclude: /(tesseract-asset|page-lifecycle)/, // tesseract causes problems, page-lifecycle is pre-minified
   parallel: true,
   terserOptions
diff --git a/webpack/webpack.config.js b/webpack/webpack.config.js
new file mode 100644
index 00000000..de673315
--- /dev/null
+++ b/webpack/webpack.config.js
@@ -0,0 +1,9 @@
+import client from './client.config.js'
+import server from './server.config.js'
+import serviceworker from './service-worker.config.js'
+
+export default {
+  client,
+  server,
+  serviceworker
+}
diff --git a/yarn.lock b/yarn.lock
index 23d778d7..5fb1217b 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1068,6 +1068,13 @@
   resolved "https://registry.yarnpkg.com/@polka/url/-/url-1.0.0-next.15.tgz#6a9d143f7f4f49db2d782f9e1c8839a29b43ae23"
   integrity sha512-15spi3V28QdevleWBNXE4pIls3nFZmBbUGrW9IVPwiQczuSb9n76TCB4bsk8TSel+I1OkHEdPhu5QKMfY6rQHA==
 
+"@rollup/plugin-json@^4.1.0":
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/@rollup/plugin-json/-/plugin-json-4.1.0.tgz#54e09867ae6963c593844d8bd7a9c718294496f3"
+  integrity sha512-yfLbTdNS6amI/2OpmbiBoW12vngr5NW2jCJVZSBEz+H5KfUJZ2M7sDjk0U6GOOdCWFVScShte29o9NezJ53TPw==
+  dependencies:
+    "@rollup/pluginutils" "^3.0.8"
+
 "@rollup/plugin-replace@^2.4.2":
   version "2.4.2"
   resolved "https://registry.yarnpkg.com/@rollup/plugin-replace/-/plugin-replace-2.4.2.tgz#a2d539314fbc77c244858faa523012825068510a"
@@ -1076,7 +1083,7 @@
     "@rollup/pluginutils" "^3.1.0"
     magic-string "^0.25.7"
 
-"@rollup/pluginutils@^3.1.0":
+"@rollup/pluginutils@^3.0.8", "@rollup/pluginutils@^3.1.0":
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/@rollup/pluginutils/-/pluginutils-3.1.0.tgz#706b4524ee6dc8b103b3c995533e5ad680c02b9b"
   integrity sha512-GksZ6pr6TpIjHm8h9lSQ8pi8BE9VeubNT0OMJ3B5uZJ8pz73NPiqOtCog/x2/QzM1ENChPKxMDhiQuRHsqc+lg==
@@ -1085,6 +1092,11 @@
     estree-walker "^1.0.1"
     picomatch "^2.2.2"
 
+"@stdlib/utils-noop@^0.0.6":
+  version "0.0.6"
+  resolved "https://registry.yarnpkg.com/@stdlib/utils-noop/-/utils-noop-0.0.6.tgz#31ea29e16cf8b474d39af5ebf77d91a694f13f5a"
+  integrity sha512-P0/QflX+U0Ch4row5KLvPdnnxKsGZfT3n35+CdehJU5/qB3aOviB/wvk2Oxfas+zikIcOd8lPRSZvJa/97taiA==
+
 "@trysound/sax@0.1.1":
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/@trysound/sax/-/sax-0.1.1.tgz#3348564048e7a2d7398c935d466c0414ebb6a669"
@@ -2609,6 +2621,11 @@ es-abstract@^1.18.0-next.1, es-abstract@^1.18.0-next.2, es-abstract@^1.18.2:
     string.prototype.trimstart "^1.0.4"
     unbox-primitive "^1.0.1"
 
+es-main@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/es-main/-/es-main-1.0.2.tgz#c9030d78796f609f865b66f4125a78d77fec3de3"
+  integrity sha512-LLgW8Cby/FiyQygrI23q2EswulHiDKoyjWlDRgTGXjQ3iRim2R26VfoehpxI5oKRXSNams3L/80KtggoUdxdDQ==
+
 es-module-lexer@^0.6.0:
   version "0.6.0"
   resolved "https://registry.yarnpkg.com/es-module-lexer/-/es-module-lexer-0.6.0.tgz#e72ab05b7412e62b9be37c37a09bdb6000d706f0"
@@ -4103,18 +4120,6 @@ locate-path@^6.0.0:
   dependencies:
     p-locate "^5.0.0"
 
-lodash-es@4.17.15:
-  version "4.17.15"
-  resolved "https://registry.yarnpkg.com/lodash-es/-/lodash-es-4.17.15.tgz#21bd96839354412f23d7a10340e5eac6ee455d78"
-  integrity sha512-rlrc3yU3+JNOpZ9zj5pQtxnx2THmvRykwL4Xlxoa8I9lHBlVbbyPhgyPMioxVZ4NqyxaVVtaJnzsyOidQIhyyQ==
-
-lodash-webpack-plugin@^0.11.6:
-  version "0.11.6"
-  resolved "https://registry.yarnpkg.com/lodash-webpack-plugin/-/lodash-webpack-plugin-0.11.6.tgz#8204c6b78beb62ce5211217dfe783c21557ecd33"
-  integrity sha512-nsHN/+IxZK/C425vGC8pAxkKJ8KQH2+NJnhDul14zYNWr6HJcA95w+oRR7Cp0oZpOdMplDZXmjVROp8prPk7ig==
-  dependencies:
-    lodash "^4.17.20"
-
 lodash.debounce@^4.0.8:
   version "4.0.8"
   resolved "https://registry.yarnpkg.com/lodash.debounce/-/lodash.debounce-4.0.8.tgz#82d79bff30a67c4005ffd5e2515300ad9ca4d7af"
@@ -5371,9 +5376,9 @@ sanitize-filename@^1.6.0:
   dependencies:
     truncate-utf8-bytes "^1.0.0"
 
-sapper@nolanlawson/sapper#for-pinafore-25:
+sapper@nolanlawson/sapper#for-pinafore-26:
   version "0.27.12"
-  resolved "https://codeload.github.com/nolanlawson/sapper/tar.gz/acf196a742b0b25c59b51d5280308d198f32a22e"
+  resolved "https://codeload.github.com/nolanlawson/sapper/tar.gz/4762b8e1a11c9fd9f57ac0f65f3f8a8ebf51669f"
   dependencies:
     html-minifier "^3.5.20"
     http-link-header "^1.0.2"