fix: .container set to width larger than viewport

Includes transpiled JS/TS, and Typescript declaration files (typings).

[skip ci]

.gitattributes

@@ -12,5 +12,6 @@ tests export-ignore
 
 js/dist/* -diff
 js/dist/* linguist-generated
+js/dist-typings/* linguist-generated
 
 * text=auto eol=lf

.github/FUNDING.yml

@@ -1,3 +0,0 @@
-github: flarum
-open_collective: flarum
-tidelift: packagist/flarum/core

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,24 +0,0 @@
-<!--
-IMPORTANT: We applaud pull requests, they excite us every single time. As we have an obligation to maintain a healthy code standard and quality, we take sufficient time for reviews. Please do create a separate pull request per change/issue/feature; we will ask you to split bundled pull requests.
--->
-
-**Fixes #0000**
-
-**Changes proposed in this pull request:**
-<!-- fill this out, mention the pages and/or components which have been impacted -->
-
-**Reviewers should focus on:**
-<!-- fill this out, ask for feedback on specific changes you are unsure about -->
-
-**Screenshot**
-<!-- include an image of the most relevant user-facing change, if any -->
-
-**Confirmed**
-
-- [ ] Frontend changes: tested on a local Flarum installation.
-- [ ] Backend changes: tests are green (run `composer test`).
-
-**Required changes:**
-
-- [ ] Related documentation PR: (Remove if irrelevant)
-- [ ] Related core extension PRs: (Remove if irrelevant)

.github/SECURITY.md

@@ -1,13 +0,0 @@
-# Security Policy
-
-## Supported Versions
-
-We will only patch security vulnerabilities in the stable 1.x release.
-
-## Reporting a Vulnerability
-
-If you discover a security vulnerability within Flarum, please send an email to security@flarum.org so we can address it promptly.
-
-We will get back to you as time allows.
-Discussions may commence internally, so you may not hear back immediately.
-When reporting a vulnerability, please provide your GitHub username (if available), so that we can invite you to collaborate on a [security advisory on GitHub](https://help.github.com/en/articles/about-maintainer-security-advisories).

.github/workflows/build.yml

@@ -1,33 +0,0 @@
-name: JavaScript
-
-on:
-  push:
-    branches:
-      - master
-
-jobs:
-  build:
-    name: JS / Build
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Check out code
-        uses: actions/checkout@v2
-
-      - name: Restore npm cache
-        uses: actions/cache@v2
-        with:
-          path: ~/.npm
-          key: ${{ runner.os }}-node-${{ hashFiles('js/package-lock.json') }}
-          restore-keys: |
-            ${{ runner.os }}-node-
-
-      # Our action will install npm, cd into `./js`, run `npm run build` and
-      # `npm run build-typings`, then commit and upload any changes
-      - name: Build production JS
-        uses: flarum/action-build@2
-        with:
-          github_token: ${{ secrets.GITHUB_TOKEN }}
-          build_script: build
-          package_manager: npm
-          typings_script: build-typings

.github/workflows/js.yml

@@ -0,0 +1,137 @@
+name: JS
+
+on: [workflow_dispatch, push, pull_request]
+
+env:
+  NODE_VERSION: 16
+
+jobs:
+  prettier:
+    name: Prettier
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Check out code
+        uses: actions/checkout@v2
+
+      - name: Set up Node
+        uses: actions/setup-node@v2
+        with:
+          node-version: ${{ env.NODE_VERSION }}
+          cache: "yarn"
+          cache-dependency-path: js/yarn.lock
+
+      - name: Install JS dependencies
+        run: yarn install --immutable
+        working-directory: ./js
+
+      - name: Check JS formatting
+        run: yarn run format-check
+        working-directory: ./js
+
+  typecheck:
+    name: Typecheck
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Check out code
+        uses: actions/checkout@v2
+
+      - name: Set up Node
+        uses: actions/setup-node@v2
+        with:
+          node-version: ${{ env.NODE_VERSION }}
+          cache: "yarn"
+          cache-dependency-path: js/yarn.lock
+
+      - name: Install JS dependencies
+        run: yarn --frozen-lockfile
+        working-directory: ./js
+
+      - name: Typecheck
+        run: yarn run check-typings
+        working-directory: ./js
+
+  type-coverage:
+    name: Type Coverage
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Check out code
+        uses: actions/checkout@v2
+
+      - name: Set up Node
+        uses: actions/setup-node@v2
+        with:
+          node-version: ${{ env.NODE_VERSION }}
+          cache: "yarn"
+          cache-dependency-path: js/yarn.lock
+
+      - name: Install JS dependencies
+        run: yarn --frozen-lockfile
+        working-directory: ./js
+
+      - name: Check type coverage
+        run: yarn run check-typings-coverage
+        working-directory: ./js
+
+  build-prod:
+    name: Build and commit
+    runs-on: ubuntu-latest
+    needs: [prettier, typecheck, type-coverage]
+
+    # Only commit JS on push to master branch
+    # Remember to change in `build-test` job too
+    if: github.ref == 'refs/heads/master' && github.event_name == 'push'
+
+    steps:
+      - name: Check out code
+        uses: actions/checkout@v2
+
+      - name: Set up Node
+        uses: actions/setup-node@v2
+        with:
+          node-version: ${{ env.NODE_VERSION }}
+          cache: "yarn"
+          cache-dependency-path: js/yarn.lock
+
+      # Our action will install npm, cd into `./js`, run `npm run build` and
+      # `npm run build-typings`, then commit and upload any changes
+      - name: Build production JS
+        uses: flarum/action-build@2
+        with:
+          github_token: ${{ secrets.GITHUB_TOKEN }}
+          build_script: build
+          package_manager: yarn
+          typings_script: build-typings
+
+  build-test:
+    name: Test build
+    runs-on: ubuntu-latest
+    needs: [prettier, typecheck, type-coverage]
+
+    # Inverse check of `build-prod`
+    # Remember to change in `build-prod` job too
+    if: github.ref != 'refs/heads/master' || github.event_name != 'push'
+
+    steps:
+      - name: Check out code
+        uses: actions/checkout@v2
+
+      - name: Set up Node
+        uses: actions/setup-node@v2
+        with:
+          node-version: ${{ env.NODE_VERSION }}
+          cache: "yarn"
+          cache-dependency-path: js/yarn.lock
+
+      # Our action will install npm, cd into `./js`, run `npm run build` and
+      # `npm run build-typings`, then commit and upload any changes
+      - name: Build production JS
+        uses: flarum/action-build@2
+        with:
+          github_token: ${{ secrets.GITHUB_TOKEN }}
+          build_script: build
+          package_manager: yarn
+          typings_script: build-typings
+          do_not_commit: true

.github/workflows/lint.yml

@@ -1,28 +0,0 @@
-name: Lint
-
-on:
-  workflow_dispatch:
-  push:
-    paths:
-      - 'js/src/**'
-  pull_request:
-    paths:
-      - 'js/src/**'
-
-jobs:
-  prettier:
-    name: JS / Prettier
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Check out code
-        uses: actions/checkout@v2
-
-      - name: Set up Node
-        uses: actions/setup-node@v2
-        with:
-          node-version: "14"
-
-      - name: Check JS formatting
-        run: npx prettier --check src
-        working-directory: ./js

.github/workflows/test.yml

@@ -8,7 +8,7 @@ jobs:
 
     strategy:
       matrix:
-        php: [7.3, 7.4, '8.0']
+        php: [7.3, 7.4, '8.0', '8.1']
         service: ['mysql:5.7', mariadb]
         prefix: ['', flarum_]
 

.gitignore

@@ -1,7 +1,6 @@
 /vendor
 composer.lock
 composer.phar
-node_modules
 .DS_Store
 Thumbs.db
 tests/.phpunit.result.cache
@@ -9,3 +8,4 @@ tests/.phpunit.result.cache
 .vagrant
 .idea/*
 .vscode
+js/coverage-ts

CHANGELOG.md

@@ -1,5 +1,80 @@
 # Changelog
 
+
+## [1.1.0](https://github.com/flarum/core/compare/v1.0.4...v1.1.0)
+
+### Added
+- Info command now displays MySQL version, queue driver, mail driver (https://github.com/flarum/core/pull/2991)
+- Use organization Prettier config (https://github.com/flarum/core/pull/2967)
+- Support for global typings in extensions (https://github.com/flarum/core/pull/2992)
+- Typings for class component state attribute (https://github.com/flarum/core/pull/2995)
+- Custom colorising with CSS custom properties (https://github.com/flarum/core/pull/3001)
+- Theme Extender to allow overriding LESS files (https://github.com/flarum/core/pull/3008)
+- Update lastSeenAt when authenticating via API (https://github.com/flarum/core/pull/3058)
+- NoJs Admin View (https://github.com/flarum/core/pull/3059)
+- Preload FontAwesome, JS and CSS, and add `preload` extender (https://github.com/flarum/core/pull/3057)
+
+### Changed
+- Move Day.js plugin types import to global typings (https://github.com/flarum/core/pull/2954)
+- Avoid resolving excluded middleware on each middleware items
+- Allow extra attrs provided to `<Select>` to be passed through to the DOM element (https://github.com/flarum/core/pull/2959)
+- Limit height of code blocks (https://github.com/flarum/core/pull/3012)
+- Update normalize.css from v3.0.2 to v8.0.1 (https://github.com/flarum/core/pull/3015)
+- Permission Grid: stick the headers to handle a lot of tags (https://github.com/flarum/core/pull/2887)
+- Use `ItemList` for `DiscussionPage` content (https://github.com/flarum/core/pull/3004)
+- Move email confirmation to POST request (https://github.com/flarum/core/pull/3038)
+- Minor CSS code cleanup (https://github.com/flarum/core/pull/3026) 
+- Replace username with display name in more places (https://github.com/flarum/core/pull/3040) 
+- Rewrite Button to Typescript (https://github.com/flarum/core/pull/2984)
+- Rewrite AdminPage abstract component into Typescript (https://github.com/flarum/core/pull/2996)
+- Allow adding page parameters to PaginatedListState (https://github.com/flarum/core/pull/2935)
+- Pass filter params to getApiDocument (https://github.com/flarum/core/pull/3037)
+- Use author filter instead of gambit to get a user's discussions (https://github.com/flarum/core/pull/3068)
+- [A11Y] Accessibility improvements for the Search component (https://github.com/flarum/core/pull/3017)
+- Add determinsm to extension order resolution (https://github.com/flarum/core/pull/3076)
+- Add cache control headers to the admin area (https://github.com/flarum/core/pull/3097)
+
+### Fixed
+- HLJS 11 new styles resulting in double padding (https://github.com/flarum/core/pull/2909)
+- Internal API client attempting to load an uninstantiated session
+- Empty post footer taking visual space (https://github.com/flarum/core/pull/2926)
+- Unrecognized component class custom attribute typings (https://github.com/flarum/core/pull/2962)
+- User edit groups permission not visually depending on view hidden groups permission (https://github.com/flarum/core/pull/2880)
+- Event post excerpt preview triggers error (https://github.com/flarum/core/pull/2964)
+- Missing settings defaults for display name driver and User slug driver (https://github.com/flarum/core/pull/2971)
+- [A11Y] Icons not hidden from screenreaders (https://github.com/flarum/core/pull/3027)
+- [A11Y] Checkboxes not focusable (https://github.com/flarum/core/pull/3014)
+- Uploading ICO favicons resulting in server errors (https://github.com/flarum/core/pull/2949)
+- Missing proper validation for large avatar upload payload (https://github.com/flarum/core/pull/3042)
+- [A11Y] Missing focus rings in control elements (https://github.com/flarum/core/pull/3016)
+- Unsanitised integer query parameters (https://github.com/flarum/core/pull/3064)
+
+###### Code Contributors
+@lhsazevedo, @Ornanovitch, @pierres, @the-turk, @iPurpl3x
+
+###### Issue Reporters
+@uamv, @dannyuk1982, @BurnNoticeSpy, @haarp, @peopleinside, @matteocontrini
+
+## [1.0.4](https://github.com/flarum/core/compare/v1.0.3...v1.0.4)
+
+### Fixed
+
+- Upgrade to v1.0 resets the "view" permission on all tags (https://github.com/flarum/core/pull/2941)
+
+## [1.0.3](https://github.com/flarum/core/compare/v1.0.2...v1.0.3)
+
+### Changed
+
+- Removed [forum] prefix from Request Password and Email Confirmation emails ([a4a81c0](https://github.com/flarum/core/commit/a4a81c0ec237476cd6e7ca00c1ed9465493af476))
+- Adopt huntr.dev for handling our security vulnerability reports (https://github.com/flarum/core/pull/2918)
+- Maintenance handler can now be replaced through the service container (ioc) ([4acff91](https://github.com/flarum/core/commit/4acff91f8063fcced9bf8c9a76fbb510d06823c0))
+- The colors on the auto generated avatars are now based on the Display Name of the user (https://github.com/flarum/core/pull/2873)
+
+### Fixed
+
+- Avatar in notifications list are incorrectly aligned (https://github.com/flarum/core/pull/2906) 
+- FilesystemManager is not compatible with upstream Laravel implementation (https://github.com/flarum/core/pull/2936)
+
 ## [1.0.2](https://github.com/flarum/core/compare/v1.0.1...v1.0.2)
 
 ### Fixed

README.md

@@ -5,10 +5,10 @@
 <a href="https://packagist.org/packages/flarum/core"><img src="https://img.shields.io/packagist/dt/flarum/core" alt="Total Downloads"></a>
 <a href="https://packagist.org/packages/flarum/core"><img src="https://img.shields.io/github/v/release/flarum/core?sort=semver" alt="Latest Version"></a>
 <a href="https://packagist.org/packages/flarum/core"><img src="https://img.shields.io/packagist/l/flarum/core" alt="License"></a>
+<a href="https://huntr.dev/bounties/disclose/?target=https://github.com/flarum/core"><img src="https://cdn.huntr.dev/huntr_security_badge_mono.svg" alt="huntr"></a>
 <a href="https://github.styleci.io/repos/28257573"><img src="https://github.styleci.io/repos/28257573/shield?style=flat" alt="StyleCI"></a>
 </p>
 
-
 ## About Flarum
 
 **[Flarum](https://flarum.org/) is a delightfully simple discussion platform for your website.** It's fast and easy to use, with all the features you need to run a successful community. It is designed to be:
@@ -19,13 +19,15 @@
 
 * **Powerful and extensible.** Customize, extend, and integrate Flarum to suit your community. Flarum’s architecture is amazingly flexible, with a powerful Extension API.
 
+![Screenshot of a Flarum instance, showing multiple discussions and tags.](https://flarum.org/assets/img/home-screenshot.png)
+
 ## Installation
 
-This repository contains Flarum's core code. If you want to set up a forum, visit the [Flarum skeleton repository](https://github.com/flarum/flarum).
+This repository contains Flarum's core code. If you want to set up a forum, visit the [Flarum skeleton repository](https://github.com/flarum/flarum). For support, refer to the [documentation](https://docs.flarum.org/), and ask questions on [Flarum Discuss](https://discuss.flarum.org/) (our community forum) or [Discord server](https://flarum.org/discord/).
 
 ## Contributing
 
-Thank you for considering contributing to Flarum! Please read the **[Contributing guide](https://flarum.org/docs/contributing.html)** to learn how you can help.
+Thank you for considering contributing to Flarum! Please read the **[Contributing guide](https://docs.flarum.org/contributing)** to learn how you can help.
 
 ## Security Vulnerabilities
 

composer.json

@@ -14,10 +14,26 @@
             "homepage": "https://flarum.org/team"
         }
     ],
+    "funding": [
+        {
+            "type": "opencollective",
+            "url": "https://opencollective.com/flarum"
+        },
+        {
+            "type": "github",
+            "url": "https://github.com/sponsors/flarum"
+        },
+        {
+            "type": "other",
+            "url": "https://flarum.org/donate"
+        }
+    ],
     "support": {
         "issues": "https://github.com/flarum/core/issues",
         "source": "https://github.com/flarum/core",
-        "docs": "https://flarum.org/docs/"
+        "docs": "https://docs.flarum.org",
+        "forum": "https://discuss.flarum.org",
+        "chat": "https://flarum.org/chat"
     },
     "require": {
         "php": ">=7.3",
@@ -43,7 +59,7 @@
         "illuminate/support": "^8.0",
         "illuminate/validation": "^8.0",
         "illuminate/view": "^8.0",
-        "intervention/image": "^2.5.0",
+        "intervention/image": "2.5.* || ^2.6.1",
         "laminas/laminas-diactoros": "^2.4.1",
         "laminas/laminas-httphandlerrunner": "^1.2.0",
         "laminas/laminas-stratigility": "^3.2.2",

js/.gitignore

@@ -0,0 +1,9 @@
+.pnp.*
+.yarn/*
+!.yarn/patches
+!.yarn/plugins
+!.yarn/releases
+!.yarn/sdks
+!.yarn/versions
+
+node_modules

js/.prettierrc.json

@@ -1,6 +0,0 @@
-{
-  "printWidth": 150,
-  "singleQuote": true,
-  "tabWidth": 2,
-  "trailingComma": "es5"
-}

js/.yarnrc.yml

@@ -0,0 +1,2 @@
+yarnPath: .yarn/releases/yarn-3.1.0.cjs
+nodeLinker: node-modules

js/@types/global/index.d.ts

@@ -1,39 +0,0 @@
-// Mithril
-import Mithril from 'mithril';
-
-// Other third-party libs
-import * as _dayjs from 'dayjs';
-import * as _$ from 'jquery';
-
-// Globals from flarum/core
-import Application from '../../src/common/Application';
-
-import type { TooltipJQueryFunction } from '../tooltips';
-
-/**
- * flarum/core exposes several extensions globally:
- *
- * - jQuery for convenient DOM manipulation
- * - Mithril for VDOM and components
- * - dayjs for date/time operations
- *
- * Since these are already part of the global namespace, extensions won't need
- * to (and should not) bundle these themselves.
- */
-declare global {
-  // $ is already defined by `@types/jquery`
-  const m: Mithril.Static;
-  const dayjs: typeof _dayjs;
-
-  // Extend JQuery with our custom functions, defined with $.fn
-  interface JQuery {
-    tooltip: TooltipJQueryFunction;
-  }
-}
-
-/**
- * All global variables owned by flarum/core.
- */
-declare global {
-  const app: Application;
-}

js/dist-typings/@types/global.d.ts

@@ -0,0 +1,138 @@
+declare type Writable<T> = { -readonly [P in keyof T]: T[P] };
+declare type DeepWritable<T> = { -readonly [P in keyof T]: DeepWritable<T[P]> };
+
+declare type DeepReadonly<T> = { readonly [P in keyof T]: DeepReadonly<T[P]> };
+
+/**
+ * UTILITY TYPES
+ */
+
+/**
+ * Type that returns an array of all keys of a provided object that are of
+ * of the provided type, or a subtype of the type.
+ */
+declare type KeysOfType<Type extends object, Match> = {
+  [Key in keyof Type]-?: Type[Key] extends Match ? Key : never;
+};
+
+/**
+ * Type that matches one of the keys of an object that is of the provided
+ * type, or a subtype of it.
+ */
+declare type KeyOfType<Type extends object, Match> = KeysOfType<Type, Match>[keyof Type];
+
+type Component<A> = import('mithril').Component<A>;
+
+declare type ComponentClass<Attrs = Record<string, unknown>, C extends Component<Attrs> = Component<Attrs>> = {
+  new (...args: any[]): Component<Attrs>;
+  prototype: C;
+};
+
+/**
+ * Unfortunately, TypeScript only supports strings and classes for JSX tags.
+ * Therefore, our type definition should only allow for those two types.
+ *
+ * @see https://github.com/microsoft/TypeScript/issues/14789#issuecomment-412247771
+ */
+declare type VnodeElementTag<Attrs = Record<string, unknown>, C extends Component<Attrs> = Component<Attrs>> = string | ComponentClass<Attrs, C>;
+
+/**
+ * @deprecated Please import `app` from a namespace instead of using it as a global variable.
+ *
+ * @example App in forum JS
+ * ```
+ * import app from 'flarum/forum/app';
+ * ```
+ *
+ * @example App in admin JS
+ * ```
+ * import app from 'flarum/admin/app';
+ * ```
+ *
+ * @example App in common JS
+ * ```
+ * import app from 'flarum/common/app';
+ * ```
+ */
+declare const app: never;
+
+declare const m: import('mithril').Static;
+declare const dayjs: typeof import('dayjs');
+
+/**
+ * From https://github.com/lokesh/color-thief/issues/188
+ */
+declare module 'color-thief-browser' {
+  type Color = [number, number, number];
+  export default class ColorThief {
+    getColor: (img: HTMLImageElement | null) => Color;
+    getPalette: (img: HTMLImageElement | null) => Color[];
+  }
+}
+
+type ESModule = { __esModule: true; [key: string]: unknown };
+
+/**
+ * The global `flarum` variable.
+ *
+ * Contains the compiled ES Modules for all Flarum extensions and core.
+ *
+ * @example <caption>Check if `flarum-tags` is present</captions>
+ * if ('flarum-tags' in flarum.extensions) {
+ *   // Tags is installed and enabled!
+ * }
+ */
+interface FlarumObject {
+  /**
+   * Contains the compiled ES Module for Flarum's core.
+   *
+   * You shouldn't need to access this directly for any reason.
+   */
+  core: Readonly<ESModule>;
+  /**
+   * Contains the compiled ES Modules for all Flarum extensions.
+   *
+   * @example <caption>Check if `flarum-tags` is present</captions>
+   * if ('flarum-tags' in flarum.extensions) {
+   *   // Tags is installed and enabled!
+   * }
+   */
+  extensions: Readonly<Record<string, ESModule>>;
+}
+
+declare const flarum: FlarumObject;
+
+// Extend JQuery with our custom functions, defined with $.fn
+interface JQuery {
+  /**
+   * Flarum's tooltip JQuery plugin.
+   *
+   * Do not use this directly. Instead use the `<Tooltip>` component that
+   * is exported from `flarum/common/components/Tooltip`.
+   *
+   * This will be removed in a future version of Flarum.
+   *
+   * @deprecated
+   */
+  tooltip: import('./tooltips/index').TooltipJQueryFunction;
+}
+
+/**
+ * For more info, see: https://www.typescriptlang.org/docs/handbook/jsx.html#attribute-type-checking
+ *
+ * In a nutshell, we need to add `ElementAttributesProperty` to tell Typescript
+ * what property on component classes to look at for attribute typings. For our
+ * Component class, this would be `attrs` (e.g. `this.attrs...`)
+ */
+interface JSX {
+  ElementAttributesProperty: {
+    attrs: Record<string, unknown>;
+  };
+}
+
+interface Event {
+  /**
+   * Whether this event should trigger a Mithril redraw.
+   */
+  redraw: boolean;
+}

js/dist-typings/@types/global/index.d.ts

@@ -1,39 +0,0 @@
-// Mithril
-import Mithril from 'mithril';
-
-// Other third-party libs
-import * as _dayjs from 'dayjs';
-import * as _$ from 'jquery';
-
-// Globals from flarum/core
-import Application from '../../src/common/Application';
-
-import type { TooltipJQueryFunction } from '../tooltips';
-
-/**
- * flarum/core exposes several extensions globally:
- *
- * - jQuery for convenient DOM manipulation
- * - Mithril for VDOM and components
- * - dayjs for date/time operations
- *
- * Since these are already part of the global namespace, extensions won't need
- * to (and should not) bundle these themselves.
- */
-declare global {
-  // $ is already defined by `@types/jquery`
-  const m: Mithril.Static;
-  const dayjs: typeof _dayjs;
-
-  // Extend JQuery with our custom functions, defined with $.fn
-  interface JQuery {
-    tooltip: TooltipJQueryFunction;
-  }
-}
-
-/**
- * All global variables owned by flarum/core.
- */
-declare global {
-  const app: Application;
-}

js/dist-typings/admin/AdminApplication.d.ts

@@ -1,3 +1,30 @@
+import Application from '../common/Application';
+import ExtensionData from './utils/ExtensionData';
+export declare type Extension = {
+    id: string;
+    version: string;
+    description?: string;
+    icon?: {
+        name: string;
+    };
+    links: {
+        authors?: {
+            name?: string;
+            link?: string;
+        }[];
+        discuss?: string;
+        documentation?: string;
+        support?: string;
+        website?: string;
+        donate?: string;
+        source?: string;
+    };
+    extra: {
+        'flarum-extension': {
+            title: string;
+        };
+    };
+};
 export default class AdminApplication extends Application {
     extensionData: ExtensionData;
     extensionCategories: {
@@ -8,10 +35,27 @@ export default class AdminApplication extends Application {
     history: {
         canGoBack: () => boolean;
         getPrevious: () => void;
-        backUrl: () => any;
+        backUrl: () => string;
         back: () => void;
     };
-    getRequiredPermissions(permission: any): string[];
+    /**
+     * Settings are serialized to the admin dashboard as strings.
+     * Additional encoding/decoding is possible, but must take
+     * place on the client side.
+     *
+     * @inheritdoc
+     */
+    data: Application['data'] & {
+        extensions: Record<string, Extension>;
+        settings: Record<string, string>;
+        modelStatistics: Record<string, {
+            total: number;
+        }>;
+    };
+    constructor();
+    /**
+     * @inheritdoc
+     */
+    mount(): void;
+    getRequiredPermissions(permission: string): string[];
 }
-import Application from "../common/Application";
-import ExtensionData from "./utils/ExtensionData";

js/dist-typings/admin/compat.d.ts

@@ -1,5 +1,5 @@
 declare var _default: {
-    extend: typeof import("../common/extend");
+    extend: any;
     Session: typeof import("../common/Session").default;
     Store: typeof import("../common/Store").default;
     'utils/BasicEditorDriver': typeof import("../common/utils/BasicEditorDriver").default;
@@ -32,17 +32,15 @@ declare var _default: {
     'utils/subclassOf': typeof import("../common/utils/subclassOf").default;
     'utils/setRouteWithForcedRefresh': typeof import("../common/utils/setRouteWithForcedRefresh").default;
     'utils/patchMithril': typeof import("../common/utils/patchMithril").default;
-    'utils/proxifyCompat': (compat: {
-        [key: string]: any;
-    }, namespace: string) => {
-        [key: string]: any;
-    };
+    'utils/proxifyCompat': typeof import("../common/utils/proxifyCompat").default;
     'utils/classList': (...classes: import("clsx").ClassValue[]) => string;
     'utils/extractText': typeof import("../common/utils/extractText").default;
     'utils/formatNumber': typeof import("../common/utils/formatNumber").default;
     'utils/mapRoutes': typeof import("../common/utils/mapRoutes").default;
     'utils/withAttr': (key: string, cb: Function) => (this: Element) => void;
     'utils/throttleDebounce': typeof import("../common/utils/throttleDebounce");
+    'utils/isObject': typeof import("../common/utils/isObject").default;
+    'utils/focusTrap': typeof import("../common/utils/focusTrap");
     'models/Notification': typeof import("../common/models/Notification").default;
     'models/User': typeof import("../common/models/User").default;
     'models/Post': typeof import("../common/models/Post").default;
@@ -69,6 +67,7 @@ declare var _default: {
     'components/Link': typeof import("../common/components/Link").default;
     'components/LinkButton': typeof import("../common/components/LinkButton").default;
     'components/Checkbox': typeof import("../common/components/Checkbox").default;
+    'components/ColorPreviewInput': typeof import("../common/components/ColorPreviewInput").default;
     'components/SelectDropdown': typeof import("../common/components/SelectDropdown").default;
     'components/ModalManager': typeof import("../common/components/ModalManager").default;
     'components/Button': typeof import("../common/components/Button").default;
@@ -96,6 +95,7 @@ declare var _default: {
     'utils/ExtensionData': typeof ExtensionData;
     'utils/isExtensionEnabled': typeof isExtensionEnabled;
     'utils/getCategorizedExtensions': typeof getCategorizedExtensions;
+    'utils/generateElementId': typeof generateElementId;
     'components/SettingDropdown': typeof SettingDropdown;
     'components/EditCustomFooterModal': typeof EditCustomFooterModal;
     'components/SessionDropdown': typeof SessionDropdown;
@@ -132,6 +132,7 @@ import saveSettings from "./utils/saveSettings";
 import ExtensionData from "./utils/ExtensionData";
 import isExtensionEnabled from "./utils/isExtensionEnabled";
 import getCategorizedExtensions from "./utils/getCategorizedExtensions";
+import generateElementId from "./utils/generateElementId";
 import SettingDropdown from "./components/SettingDropdown";
 import EditCustomFooterModal from "./components/EditCustomFooterModal";
 import SessionDropdown from "./components/SessionDropdown";

js/dist-typings/admin/components/AdminHeader.d.ts

@@ -1,4 +1,4 @@
-export default class AdminHeader extends Component<import("../../common/Component").ComponentAttrs> {
+export default class AdminHeader extends Component<import("../../common/Component").ComponentAttrs, undefined> {
     constructor();
 }
 import Component from "../../common/Component";

js/dist-typings/admin/components/AdminNav.d.ts

@@ -1,4 +1,4 @@
-export default class AdminNav extends Component<import("../../common/Component").ComponentAttrs> {
+export default class AdminNav extends Component<import("../../common/Component").ComponentAttrs, undefined> {
     constructor();
     query: Stream<string> | undefined;
     scrollToActive(): void;
@@ -7,8 +7,8 @@ export default class AdminNav extends Component<import("../../common/Component")
      *
      * @return {ItemList}
      */
-    items(): ItemList;
-    extensionItems(): ItemList;
+    items(): ItemList<any>;
+    extensionItems(): ItemList<any>;
 }
 import Component from "../../common/Component";
 import Stream from "../../common/utils/Stream";

js/dist-typings/admin/components/AdminPage.d.ts

@@ -1,17 +1,109 @@
-export default class AdminPage extends Page {
-    settings: {} | undefined;
-    loading: boolean | undefined;
-    content(): string;
-    submitButton(): JSX.Element;
-    header(): JSX.Element;
-    headerInfo(): {
-        className: string;
-        icon: string;
-        title: string;
-        description: string;
-    };
+import type Mithril from 'mithril';
+import Page, { IPageAttrs } from '../../common/components/Page';
+import Stream from '../../common/utils/Stream';
+export interface AdminHeaderOptions {
+    title: Mithril.Children;
+    description: Mithril.Children;
+    icon: string;
     /**
-     * buildSettingComponent takes a settings object and turns it into a component.
+     * Will be used as the class for the AdminPage.
+     *
+     * Will also be appended with `-header` and set as the class for the `AdminHeader` component.
+     */
+    className: string;
+}
+/**
+ * A type that matches any valid value for the `type` attribute on an HTML `<input>` element.
+ *
+ * @see https://developer.mozilla.org/en-US/docs/Web/HTML/Element/input#attr-type
+ *
+ * Note: this will be exported from a different location in the future.
+ *
+ * @see https://github.com/flarum/core/issues/3039
+ */
+export declare type HTMLInputTypes = 'button' | 'checkbox' | 'color' | 'date' | 'datetime-local' | 'email' | 'file' | 'hidden' | 'image' | 'month' | 'number' | 'password' | 'radio' | 'range' | 'reset' | 'search' | 'submit' | 'tel' | 'text' | 'time' | 'url' | 'week';
+interface CommonSettingsItemOptions extends Mithril.Attributes {
+    setting: string;
+    label: Mithril.Children;
+    help?: Mithril.Children;
+    className?: string;
+}
+/**
+ * Valid options for the setting component builder to generate an HTML input element.
+ */
+export interface HTMLInputSettingsComponentOptions extends CommonSettingsItemOptions {
+    /**
+     * Any valid HTML input `type` value.
+     */
+    type: HTMLInputTypes;
+}
+declare const BooleanSettingTypes: readonly ["bool", "checkbox", "switch", "boolean"];
+declare const SelectSettingTypes: readonly ["select", "dropdown", "selectdropdown"];
+declare const TextareaSettingTypes: readonly ["textarea"];
+declare const ColorPreviewSettingType = "color-preview";
+/**
+ * Valid options for the setting component builder to generate a Switch.
+ */
+export interface SwitchSettingComponentOptions extends CommonSettingsItemOptions {
+    type: typeof BooleanSettingTypes[number];
+}
+/**
+ * Valid options for the setting component builder to generate a Select dropdown.
+ */
+export interface SelectSettingComponentOptions extends CommonSettingsItemOptions {
+    type: typeof SelectSettingTypes[number];
+    /**
+     * Map of values to their labels
+     */
+    options: {
+        [value: string]: Mithril.Children;
+    };
+    default: string;
+}
+/**
+ * Valid options for the setting component builder to generate a Textarea.
+ */
+export interface TextareaSettingComponentOptions extends CommonSettingsItemOptions {
+    type: typeof TextareaSettingTypes[number];
+}
+/**
+ * Valid options for the setting component builder to generate a ColorPreviewInput.
+ */
+export interface ColorPreviewSettingComponentOptions extends CommonSettingsItemOptions {
+    type: typeof ColorPreviewSettingType;
+}
+/**
+ * All valid options for the setting component builder.
+ */
+export declare type SettingsComponentOptions = HTMLInputSettingsComponentOptions | SwitchSettingComponentOptions | SelectSettingComponentOptions | TextareaSettingComponentOptions | ColorPreviewSettingComponentOptions;
+/**
+ * Valid attrs that can be returned by the `headerInfo` function
+ */
+export declare type AdminHeaderAttrs = AdminHeaderOptions & Partial<Omit<Mithril.Attributes, 'class'>>;
+export default abstract class AdminPage<CustomAttrs extends IPageAttrs = IPageAttrs> extends Page<CustomAttrs> {
+    settings: Record<string, Stream<string>>;
+    loading: boolean;
+    view(vnode: Mithril.Vnode<CustomAttrs, this>): Mithril.Children;
+    /**
+     * Returns the content of the AdminPage.
+     */
+    abstract content(vnode: Mithril.Vnode<CustomAttrs, this>): Mithril.Children;
+    /**
+     * Returns the submit button for this AdminPage.
+     *
+     * Calls `this.saveSettings` when the button is clicked.
+     */
+    submitButton(vnode: Mithril.Vnode<CustomAttrs, this>): Mithril.Children;
+    /**
+     * Returns the Header component for this AdminPage.
+     */
+    header(vnode: Mithril.Vnode<CustomAttrs, this>): Mithril.Children;
+    /**
+     * Returns the options passed to the AdminHeader component.
+     */
+    headerInfo(): AdminHeaderAttrs;
+    /**
+     * `buildSettingComponent` takes a settings object and turns it into a component.
      * Depending on the type of input, you can set the type to 'bool', 'select', or
      * any standard <input> type. Any values inside the 'extra' object will be added
      * to the component as an attribute.
@@ -42,14 +134,34 @@ export default class AdminPage extends Page {
      *    default: 'option1',
      * }
      *
-     * @param setting
-     * @returns {JSX.Element}
+     * @example
+     *
+     * () => {
+     *   return <p>My cool component</p>;
+     * }
+     */
+    buildSettingComponent(entry: ((this: this) => Mithril.Children) | SettingsComponentOptions): Mithril.Children;
+    /**
+     * Called when `saveSettings` completes successfully.
      */
-    buildSettingComponent(entry: any): JSX.Element;
     onsaved(): void;
-    setting(key: any, fallback?: string): any;
-    dirty(): {};
+    /**
+     * Returns a function that fetches the setting from the `app` global.
+     */
+    setting(key: string, fallback?: string): Stream<string>;
+    /**
+     * Returns a map of settings keys to values which includes only those which have been modified but not yet saved.
+     */
+    dirty(): Record<string, string>;
+    /**
+     * Returns the number of settings that have been modified.
+     */
     isChanged(): number;
-    saveSettings(e: any): Promise<void>;
+    /**
+     * Saves the modified settings to the database.
+     */
+    saveSettings(e: SubmitEvent & {
+        redraw: boolean;
+    }): Promise<void>;
 }
-import Page from "../../common/components/Page";
+export {};

js/dist-typings/admin/components/AppearancePage.d.ts

@@ -1,3 +1,6 @@
-export default class AppearancePage extends AdminPage {
+export default class AppearancePage extends AdminPage<import("../../common/components/Page").IPageAttrs> {
+    constructor();
+    colorItems(): ItemList<any>;
 }
 import AdminPage from "./AdminPage";
+import ItemList from "../../common/utils/ItemList";

js/dist-typings/admin/components/BasicsPage.d.ts

@@ -1,4 +1,5 @@
-export default class BasicsPage extends AdminPage {
+export default class BasicsPage extends AdminPage<import("../../common/components/Page").IPageAttrs> {
+    constructor();
     localeOptions: {} | undefined;
     displayNameOptions: {} | undefined;
     slugDriverOptions: {} | undefined;
@@ -9,7 +10,7 @@ export default class BasicsPage extends AdminPage {
      * @return {ItemList}
      * @public
      */
-    public homePageItems(): ItemList;
+    public homePageItems(): ItemList<any>;
 }
 import AdminPage from "./AdminPage";
 import ItemList from "../../common/utils/ItemList";

js/dist-typings/admin/components/DashboardPage.d.ts

@@ -1,5 +1,6 @@
-export default class DashboardPage extends AdminPage {
-    availableWidgets(): ItemList;
+export default class DashboardPage extends AdminPage<import("../../common/components/Page").IPageAttrs> {
+    constructor();
+    availableWidgets(): ItemList<any>;
 }
 import AdminPage from "./AdminPage";
 import ItemList from "../../common/utils/ItemList";

js/dist-typings/admin/components/DashboardWidget.d.ts

@@ -1,4 +1,4 @@
-export default class DashboardWidget extends Component<import("../../common/Component").ComponentAttrs> {
+export default class DashboardWidget extends Component<import("../../common/Component").ComponentAttrs, undefined> {
     constructor();
     /**
      * Get the class name to apply to the widget.

js/dist-typings/admin/components/EditGroupModal.d.ts

@@ -2,14 +2,15 @@
  * The `EditGroupModal` component shows a modal dialog which allows the user
  * to create or edit a group.
  */
-export default class EditGroupModal extends Modal {
+export default class EditGroupModal extends Modal<import("../../common/components/Modal").IInternalModalAttrs> {
+    constructor();
     group: any;
     nameSingular: Stream<any> | undefined;
     namePlural: Stream<any> | undefined;
     icon: Stream<any> | undefined;
     color: Stream<any> | undefined;
     isHidden: Stream<any> | undefined;
-    fields(): ItemList;
+    fields(): ItemList<any>;
     submitData(): {
         nameSingular: any;
         namePlural: any;

js/dist-typings/admin/components/ExtensionLinkButton.d.ts

@@ -1,5 +1,5 @@
 export default class ExtensionLinkButton extends LinkButton {
-    statusItems(name: any): ItemList;
+    statusItems(name: any): ItemList<any>;
 }
 import LinkButton from "../../common/components/LinkButton";
 import ItemList from "../../common/utils/ItemList";

js/dist-typings/admin/components/ExtensionPage.d.ts

@@ -1,6 +1,15 @@
-export default class ExtensionPage extends AdminPage {
-    extension: any;
-    changingState: boolean | undefined;
+import ItemList from '../../common/utils/ItemList';
+import AdminPage from './AdminPage';
+import RequestError from '../../common/utils/RequestError';
+import { Extension } from '../AdminApplication';
+import { IPageAttrs } from '../../common/components/Page';
+import type Mithril from 'mithril';
+export interface ExtensionPageAttrs extends IPageAttrs {
+    id: string;
+}
+export default class ExtensionPage<Attrs extends ExtensionPageAttrs = ExtensionPageAttrs> extends AdminPage<Attrs> {
+    extension: Extension;
+    changingState: boolean;
     infoFields: {
         discuss: string;
         documentation: string;
@@ -8,14 +17,16 @@ export default class ExtensionPage extends AdminPage {
         website: string;
         donate: string;
         source: string;
-    } | undefined;
+    };
+    oninit(vnode: Mithril.Vnode<Attrs, this>): void;
     className(): string;
-    sections(): ItemList;
-    topItems(): ItemList;
-    infoItems(): ItemList;
+    view(vnode: Mithril.VnodeDOM<Attrs, this>): JSX.Element | null;
+    header(): JSX.Element[];
+    sections(vnode: Mithril.VnodeDOM<Attrs, this>): ItemList<unknown>;
+    content(vnode: Mithril.VnodeDOM<Attrs, this>): JSX.Element;
+    topItems(): ItemList<Mithril.Children>;
+    infoItems(): ItemList<Mithril.Children>;
     toggle(): void;
     isEnabled(): any;
-    onerror(e: any): void;
+    onerror(e: RequestError): void;
 }
-import AdminPage from "./AdminPage";
-import ItemList from "../../common/utils/ItemList";

js/dist-typings/admin/components/ExtensionPermissionGrid.d.ts

@@ -1,4 +1,19 @@
-export default class ExtensionPermissionGrid extends PermissionGrid {
-    extensionId: any;
+import PermissionGrid, { PermissionGridEntry } from './PermissionGrid';
+import ItemList from '../../common/utils/ItemList';
+import Mithril from 'mithril';
+export interface IExtensionPermissionGridAttrs {
+    extensionId: string;
+}
+export default class ExtensionPermissionGrid<CustomAttrs extends IExtensionPermissionGridAttrs = IExtensionPermissionGridAttrs> extends PermissionGrid<CustomAttrs> {
+    protected extensionId: string;
+    oninit(vnode: Mithril.Vnode<CustomAttrs, this>): void;
+    permissionItems(): ItemList<{
+        label: Mithril.Children;
+        children: PermissionGridEntry[];
+    }>;
+    viewItems(): ItemList<import("./PermissionGrid").PermissionConfig>;
+    startItems(): ItemList<import("./PermissionGrid").PermissionConfig>;
+    replyItems(): ItemList<import("./PermissionGrid").PermissionConfig>;
+    moderateItems(): ItemList<import("./PermissionGrid").PermissionConfig>;
+    scopeControlItems(): ItemList<unknown>;
 }
-import PermissionGrid from "./PermissionGrid";

js/dist-typings/admin/components/HeaderPrimary.d.ts

@@ -2,7 +2,7 @@
  * The `HeaderPrimary` component displays primary header controls. On the
  * default skin, these are shown just to the right of the forum title.
  */
-export default class HeaderPrimary extends Component<import("../../common/Component").ComponentAttrs> {
+export default class HeaderPrimary extends Component<import("../../common/Component").ComponentAttrs, undefined> {
     constructor();
     config(isInitialized: any, context: any): void;
     /**
@@ -10,7 +10,7 @@ export default class HeaderPrimary extends Component<import("../../common/Compon
      *
      * @return {ItemList}
      */
-    items(): ItemList;
+    items(): ItemList<any>;
 }
 import Component from "../../common/Component";
 import ItemList from "../../common/utils/ItemList";

js/dist-typings/admin/components/HeaderSecondary.d.ts

@@ -1,14 +1,14 @@
 /**
  * The `HeaderSecondary` component displays secondary header controls.
  */
-export default class HeaderSecondary extends Component<import("../../common/Component").ComponentAttrs> {
+export default class HeaderSecondary extends Component<import("../../common/Component").ComponentAttrs, undefined> {
     constructor();
     /**
      * Build an item list for the controls.
      *
      * @return {ItemList}
      */
-    items(): ItemList;
+    items(): ItemList<any>;
 }
 import Component from "../../common/Component";
 import ItemList from "../../common/utils/ItemList";

js/dist-typings/admin/components/LoadingModal.d.ts

@@ -1,3 +1,14 @@
-export default class LoadingModal extends Modal {
+/// <reference path="../../../src/common/translator-icu-rich.d.ts" />
+import Modal, { IInternalModalAttrs } from '../../common/components/Modal';
+export interface ILoadingModalAttrs extends IInternalModalAttrs {
+}
+export default class LoadingModal<ModalAttrs extends ILoadingModalAttrs = ILoadingModalAttrs> extends Modal<ModalAttrs> {
+    /**
+     * @inheritdoc
+     */
+    static readonly isDismissible: boolean;
+    className(): string;
+    title(): import("@askvortsov/rich-icu-message-formatter").NestedStringArray;
+    content(): string;
+    onsubmit(e: Event): void;
 }
-import Modal from "../../common/components/Modal";

js/dist-typings/admin/components/MailPage.d.ts

@@ -1,4 +1,5 @@
-export default class MailPage extends AdminPage {
+export default class MailPage extends AdminPage<import("../../common/components/Page").IPageAttrs> {
+    constructor();
     sendingTest: boolean | undefined;
     refresh(): void;
     status: {

js/dist-typings/admin/components/PermissionGrid.d.ts

@@ -1,12 +1,36 @@
-export default class PermissionGrid extends Component<import("../../common/Component").ComponentAttrs> {
-    constructor();
-    permissionItems(): ItemList;
-    viewItems(): ItemList;
-    startItems(): ItemList;
-    replyItems(): ItemList;
-    moderateItems(): ItemList;
-    scopeItems(): ItemList;
-    scopeControlItems(): ItemList;
+import Component, { ComponentAttrs } from '../../common/Component';
+import ItemList from '../../common/utils/ItemList';
+import type Mithril from 'mithril';
+export interface PermissionConfig {
+    permission: string;
+    icon: string;
+    label: Mithril.Children;
+    allowGuest?: boolean;
+}
+export interface PermissionSetting {
+    setting: () => Mithril.Children;
+    icon: string;
+    label: Mithril.Children;
+}
+export declare type PermissionGridEntry = PermissionConfig | PermissionSetting;
+export declare type PermissionType = 'view' | 'start' | 'reply' | 'moderate';
+export interface ScopeItem {
+    label: Mithril.Children;
+    render: (permission: PermissionGridEntry) => Mithril.Children;
+    onremove?: () => void;
+}
+export interface IPermissionGridAttrs extends ComponentAttrs {
+}
+export default class PermissionGrid<CustomAttrs extends IPermissionGridAttrs = IPermissionGridAttrs> extends Component<CustomAttrs> {
+    view(vnode: Mithril.Vnode<CustomAttrs, this>): JSX.Element;
+    permissionItems(): ItemList<{
+        label: Mithril.Children;
+        children: PermissionGridEntry[];
+    }>;
+    viewItems(): ItemList<PermissionGridEntry>;
+    startItems(): ItemList<PermissionGridEntry>;
+    replyItems(): ItemList<PermissionGridEntry>;
+    moderateItems(): ItemList<PermissionGridEntry>;
+    scopeItems(): ItemList<ScopeItem>;
+    scopeControlItems(): ItemList<unknown>;
 }
-import Component from "../../common/Component";
-import ItemList from "../../common/utils/ItemList";

js/dist-typings/admin/components/PermissionsPage.d.ts

@@ -1,3 +1,4 @@
-export default class PermissionsPage extends AdminPage {
+export default class PermissionsPage extends AdminPage<import("../../common/components/Page").IPageAttrs> {
+    constructor();
 }
 import AdminPage from "./AdminPage";

js/dist-typings/admin/components/ReadmeModal.d.ts

@@ -0,0 +1,18 @@
+/// <reference path="../../../src/common/translator-icu-rich.d.ts" />
+import Modal, { IInternalModalAttrs } from '../../common/components/Modal';
+import ExtensionReadme from '../models/ExtensionReadme';
+import type Mithril from 'mithril';
+import type { Extension } from '../AdminApplication';
+export interface IReadmeModalAttrs extends IInternalModalAttrs {
+    extension: Extension;
+}
+export default class ReadmeModal<CustomAttrs extends IReadmeModalAttrs = IReadmeModalAttrs> extends Modal<CustomAttrs> {
+    protected name: string;
+    protected extName: string;
+    protected readme: ExtensionReadme;
+    oninit(vnode: Mithril.Vnode<CustomAttrs, this>): void;
+    className(): string;
+    title(): import("@askvortsov/rich-icu-message-formatter").NestedStringArray;
+    content(): JSX.Element;
+    loadReadme(): Promise<void>;
+}

js/dist-typings/admin/components/SessionDropdown.d.ts

@@ -8,7 +8,7 @@ export default class SessionDropdown extends Dropdown {
      *
      * @return {ItemList}
      */
-    items(): ItemList;
+    items(): ItemList<any>;
 }
 import Dropdown from "../../common/components/Dropdown";
 import ItemList from "../../common/utils/ItemList";

js/dist-typings/admin/components/SettingsModal.d.ts

@@ -1,4 +1,5 @@
-export default class SettingsModal extends Modal {
+export default class SettingsModal extends Modal<import("../../common/components/Modal").IInternalModalAttrs> {
+    constructor();
     settings: {} | undefined;
     form(): string;
     submitButton(): JSX.Element;

js/dist-typings/admin/components/StatusWidget.d.ts

@@ -1,5 +1,6 @@
 export default class StatusWidget extends DashboardWidget {
-    items(): ItemList;
+    items(): ItemList<any>;
+    toolsItems(): ItemList<any>;
     handleClearCache(e: any): void;
 }
 import DashboardWidget from "./DashboardWidget";

js/dist-typings/admin/components/UploadImageButton.d.ts

@@ -1,4 +1,5 @@
-export default class UploadImageButton extends Button {
+export default class UploadImageButton extends Button<import("../../common/components/Button").IButtonAttrs> {
+    constructor();
     loading: boolean;
     /**
      * Prompt the user to upload an image.

js/dist-typings/admin/components/UserListPage.d.ts

@@ -1,6 +1,18 @@
-/// <reference types="mithril" />
+/// <reference path="../../../src/common/translator-icu-rich.d.ts" />
+import type Mithril from 'mithril';
+import type User from '../../common/models/User';
 import ItemList from '../../common/utils/ItemList';
 import AdminPage from './AdminPage';
+declare type ColumnData = {
+    /**
+     * Column title
+     */
+    name: Mithril.Children;
+    /**
+     * Component(s) to show for this column.
+     */
+    content: (user: User) => Mithril.Children;
+};
 /**
  * Admin page which displays a paginated list of all users on the forum.
  */
@@ -50,12 +62,12 @@ export default class UserListPage extends AdminPage {
      *
      * See `UserListPage.tsx` for examples.
      */
-    columns(): ItemList;
+    columns(): ItemList<ColumnData>;
     headerInfo(): {
         className: string;
         icon: string;
-        title: any;
-        description: any;
+        title: import("@askvortsov/rich-icu-message-formatter").NestedStringArray;
+        description: import("@askvortsov/rich-icu-message-formatter").NestedStringArray;
     };
     /**
      * Asynchronously fetch the next set of users to be rendered.
@@ -70,3 +82,4 @@ export default class UserListPage extends AdminPage {
     nextPage(): void;
     previousPage(): void;
 }
+export {};

js/dist-typings/admin/index.d.ts

@@ -1,5 +1,3 @@
 import app from './app';
 export { app };
-export declare const compat: {
-    [key: string]: any;
-};
+export declare const compat: Record<string, unknown>;

js/dist-typings/admin/models/ExtensionReadme.d.ts

@@ -0,0 +1,4 @@
+export default class ExtensionReadme extends Model {
+    content: () => any;
+}
+import Model from "../../common/Model";

js/dist-typings/admin/resolvers/ExtensionPageResolver.d.ts

@@ -1,9 +1,10 @@
 import DefaultResolver from '../../common/resolvers/DefaultResolver';
+import ExtensionPage, { ExtensionPageAttrs } from '../components/ExtensionPage';
 /**
  * A custom route resolver for ExtensionPage that generates handles routes
  * to default extension pages or a page provided by an extension.
  */
-export default class ExtensionPageResolver extends DefaultResolver {
+export default class ExtensionPageResolver<Attrs extends ExtensionPageAttrs = ExtensionPageAttrs, RouteArgs extends Record<string, unknown> = {}> extends DefaultResolver<Attrs, ExtensionPage<Attrs>, RouteArgs> {
     static extension: string | null;
-    onmatch(args: any, requestedPath: any, route: any): any;
+    onmatch(args: Attrs & RouteArgs, requestedPath: string, route: string): new () => ExtensionPage<Attrs>;
 }

js/dist-typings/admin/routes.d.ts

@@ -1,6 +1,5 @@
+import AdminApplication from './AdminApplication';
 /**
  * The `routes` initializer defines the forum app's routes.
- *
- * @param {App} app
  */
-export default function _default(app: any): void;
+export default function (app: AdminApplication): void;

js/dist-typings/admin/utils/ExtensionData.d.ts

@@ -1,17 +1,46 @@
+import type Mithril from 'mithril';
+import ItemList from '../../common/utils/ItemList';
+import { SettingsComponentOptions } from '../components/AdminPage';
+import ExtensionPage, { ExtensionPageAttrs } from '../components/ExtensionPage';
+import { PermissionConfig, PermissionType } from '../components/PermissionGrid';
+declare type SettingConfigInput = SettingsComponentOptions | (() => Mithril.Children);
+declare type SettingConfigInternal = SettingsComponentOptions | ((() => Mithril.Children) & {
+    setting: string;
+});
+export declare type CustomExtensionPage<Attrs extends ExtensionPageAttrs = ExtensionPageAttrs> = new () => ExtensionPage<Attrs>;
+declare type ExtensionConfig = {
+    settings?: ItemList<SettingConfigInternal>;
+    permissions?: {
+        view?: ItemList<PermissionConfig>;
+        start?: ItemList<PermissionConfig>;
+        reply?: ItemList<PermissionConfig>;
+        moderate?: ItemList<PermissionConfig>;
+    };
+    page?: CustomExtensionPage;
+};
+declare type InnerDataNoActiveExtension = {
+    currentExtension: null;
+    data: {
+        [key: string]: ExtensionConfig | undefined;
+    };
+};
+declare type InnerDataActiveExtension = {
+    currentExtension: string;
+    data: {
+        [key: string]: ExtensionConfig;
+    };
+};
 export default class ExtensionData {
-    data: {};
-    currentExtension: any;
+    protected state: InnerDataActiveExtension | InnerDataNoActiveExtension;
     /**
      * This function simply takes the extension id
      *
      * @example
-     * app.extensionData.load('flarum-tags')
+     * app.extensionData.for('flarum-tags')
      *
      * flarum/flags -> flarum-flags | acme/extension -> acme-extension
-     *
-     * @param extension
      */
-    for(extension: any): ExtensionData;
+    for(extension: string): this;
     /**
      * This function registers your settings with Flarum
      *
@@ -24,13 +53,8 @@ export default class ExtensionData {
      *   type: 'text', // This will be inputted into the input tag for the setting (text/number/etc)
      *   label: app.translator.trans('flarum-flags.admin.settings.guidelines_url_label')
      * }, 15) // priority is optional (ItemList)
-     *
-     *
-     * @param content
-     * @param priority
-     * @returns {ExtensionData}
      */
-    registerSetting(content: any, priority?: number): ExtensionData;
+    registerSetting(content: SettingConfigInput, priority?: number): this;
     /**
      * This function registers your permission with Flarum
      *
@@ -41,58 +65,32 @@ export default class ExtensionData {
      *     label: app.translator.trans('flarum-flags.admin.permissions.view_flags_label'),
      *     permission: 'discussion.viewFlags'
      * }, 'moderate', 65)
-     *
-     * @param content
-     * @param permissionType
-     * @param priority
-     * @returns {ExtensionData}
      */
-    registerPermission(content: any, permissionType?: any, priority?: number): ExtensionData;
+    registerPermission(content: PermissionConfig, permissionType: PermissionType, priority?: number): this;
     /**
      * Replace the default extension page with a custom component.
      * This component would typically extend ExtensionPage
-     *
-     * @param component
-     * @returns {ExtensionData}
      */
-    registerPage(component: any): ExtensionData;
+    registerPage(component: CustomExtensionPage): this;
     /**
      * Get an extension's registered settings
-     *
-     * @param extensionId
-     * @returns {boolean|*}
      */
-    getSettings(extensionId: any): boolean | any;
+    getSettings(extensionId: string): SettingConfigInternal[] | undefined;
     /**
-     *
      * Get an ItemList of all extensions' registered permissions
-     *
-     * @param extension
-     * @param type
-     * @returns {ItemList}
      */
-    getAllExtensionPermissions(type: any): ItemList;
+    getAllExtensionPermissions(type: PermissionType): ItemList<PermissionConfig>;
     /**
      * Get a singular extension's registered permissions
-     *
-     * @param extension
-     * @param type
-     * @returns {boolean|*}
      */
-    getExtensionPermissions(extension: any, type: any): boolean | any;
+    getExtensionPermissions(extension: string, type: PermissionType): ItemList<PermissionConfig>;
     /**
      * Checks whether a given extension has registered permissions.
-     *
-     * @param extension
-     * @returns {boolean}
      */
-    extensionHasPermissions(extension: any): boolean;
+    extensionHasPermissions(extension: string): boolean;
     /**
      * Returns an extension's custom page component if it exists.
-     *
-     * @param extension
-     * @returns {boolean|*}
      */
-    getPage(extension: any): boolean | any;
+    getPage<Attrs extends ExtensionPageAttrs = ExtensionPageAttrs>(extension: string): CustomExtensionPage<Attrs> | undefined;
 }
-import ItemList from "../../common/utils/ItemList";
+export {};

js/dist-typings/admin/utils/generateElementId.d.ts

@@ -0,0 +1 @@
+export { nanoid as default } from 'nanoid';

js/dist-typings/common/Application.d.ts

@@ -1,3 +1,89 @@
+import ItemList from './utils/ItemList';
+import Translator from './Translator';
+import Store, { ApiPayload, ApiResponsePlural, ApiResponseSingle } from './Store';
+import Session from './Session';
+import Drawer from './utils/Drawer';
+import RequestError, { InternalFlarumRequestOptions } from './utils/RequestError';
+import Forum from './models/Forum';
+import PageState from './states/PageState';
+import ModalManagerState from './states/ModalManagerState';
+import AlertManagerState from './states/AlertManagerState';
+import type DefaultResolver from './resolvers/DefaultResolver';
+import type Mithril from 'mithril';
+import type Component from './Component';
+import type { ComponentAttrs } from './Component';
+import Model, { SavedModelData } from './Model';
+export declare type FlarumScreens = 'phone' | 'tablet' | 'desktop' | 'desktop-hd';
+export declare type FlarumGenericRoute = RouteItem<any, any, any>;
+export interface FlarumRequestOptions<ResponseType> extends Omit<Mithril.RequestOptions<ResponseType>, 'extract'> {
+    errorHandler?: (error: RequestError) => void;
+    url: string;
+    /**
+     * Manipulate the response text before it is parsed into JSON.
+     *
+     * @deprecated Please use `modifyText` instead.
+     */
+    extract?: (responseText: string) => string;
+    /**
+     * Manipulate the response text before it is parsed into JSON.
+     *
+     * This overrides any `extract` method provided.
+     */
+    modifyText?: (responseText: string) => string;
+}
+/**
+ * A valid route definition.
+ */
+export declare type RouteItem<Attrs extends ComponentAttrs, Comp extends Component<Attrs & {
+    routeName: string;
+}>, RouteArgs extends Record<string, unknown> = {}> = {
+    /**
+     * The path for your route.
+     *
+     * This might be a specific URL path (e.g.,`/myPage`), or it might
+     * contain a variable used by a resolver (e.g., `/myPage/:id`).
+     *
+     * @see https://docs.flarum.org/extend/frontend-pages.html#route-resolvers-advanced
+     */
+    path: `/${string}`;
+} & ({
+    /**
+     * The component to render when this route matches.
+     */
+    component: new () => Comp;
+    /**
+     * A custom resolver class.
+     *
+     * This should be the class itself, and **not** an instance of the
+     * class.
+     */
+    resolverClass?: new (component: new () => Comp, routeName: string) => DefaultResolver<Attrs, Comp, RouteArgs>;
+} | {
+    /**
+     * An instance of a route resolver.
+     */
+    resolver: RouteResolver<Attrs, Comp, RouteArgs>;
+});
+export interface RouteResolver<Attrs extends ComponentAttrs, Comp extends Component<Attrs & {
+    routeName: string;
+}>, RouteArgs extends Record<string, unknown> = {}> {
+    /**
+     * A method which selects which component to render based on
+     * conditional logic.
+     *
+     * Returns the component class, and **not** a Vnode or JSX
+     * expression.
+     */
+    onmatch(this: this, args: RouteArgs, requestedPath: string, route: string): {
+        new (): Comp;
+    };
+    /**
+     * A function which renders the provided component.
+     *
+     * Returns a Mithril Vnode or other children.
+     */
+    render(this: this, vnode: Mithril.Vnode<Attrs, Comp>): Mithril.Children;
+}
 /**
  * The `App` class provides a container for an application, as well as various
  * utilities for the rest of the app to use.
@@ -5,11 +91,8 @@
 export default class Application {
     /**
      * The forum model for this application.
-     *
-     * @type {Forum}
-     * @public
      */
-    public forum: Forum;
+    forum: Forum;
     /**
      * A map of routes, keyed by a unique route name. Each route is an object
      * containing the following properties:
@@ -18,71 +101,42 @@ export default class Application {
      * - `component` The Mithril component to render when this route is active.
      *
      * @example
-     * app.routes.discussion = {path: '/d/:id', component: DiscussionPage.component()};
-     *
-     * @type {Object}
-     * @public
+     * app.routes.discussion = { path: '/d/:id', component: DiscussionPage };
      */
-    public routes: Object;
+    routes: Record<string, FlarumGenericRoute>;
     /**
      * An ordered list of initializers to bootstrap the application.
-     *
-     * @type {ItemList}
-     * @public
      */
-    public initializers: ItemList;
+    initializers: ItemList<(app: this) => void>;
     /**
      * The app's session.
      *
-     * @type {Session}
-     * @public
+     * Stores info about the current user.
      */
-    public session: Session;
+    session: Session;
     /**
      * The app's translator.
-     *
-     * @type {Translator}
-     * @public
      */
-    public translator: Translator;
+    translator: Translator;
     /**
      * The app's data store.
-     *
-     * @type {Store}
-     * @public
      */
-    public store: Store;
+    store: Store;
     /**
      * A local cache that can be used to store data at the application level, so
      * that is persists between different routes.
-     *
-     * @type {Object}
-     * @public
      */
-    public cache: Object;
+    cache: Record<string, unknown>;
     /**
      * Whether or not the app has been booted.
-     *
-     * @type {Boolean}
-     * @public
      */
-    public booted: boolean;
-    /**
-     * The key for an Alert that was shown as a result of an AJAX request error.
-     * If present, it will be dismissed on the next successful request.
-     *
-     * @type {int}
-     * @private
-     */
-    private requestErrorAlert;
+    booted: boolean;
     /**
      * The page the app is currently on.
      *
      * This object holds information about the type of page we are currently
      * visiting, and sometimes additional arbitrary page state that may be
      * relevant to lower-level components.
-     *
-     * @type {PageState}
      */
     current: PageState;
     /**
@@ -91,84 +145,89 @@ export default class Application {
      * Once the application navigates to another page, the object previously
      * assigned to this.current will be moved to this.previous, while this.current
      * is re-initialized.
-     *
-     * @type {PageState}
      */
     previous: PageState;
+    /**
+     * An object that manages modal state.
+     */
     modal: ModalManagerState;
     /**
      * An object that manages the state of active alerts.
-     *
-     * @type {AlertManagerState}
      */
     alerts: AlertManagerState;
-    data: any;
-    title: string;
-    titleCount: number;
-    initialRoute: any;
-    load(payload: any): void;
+    /**
+     * An object that manages the state of the navigation drawer.
+     */
+    drawer: Drawer;
+    data: {
+        apiDocument: ApiPayload | null;
+        locale: string;
+        locales: Record<string, string>;
+        resources: SavedModelData[];
+        session: {
+            userId: number;
+            csrfToken: string;
+        };
+        [key: string]: unknown;
+    };
+    private _title;
+    private _titleCount;
+    private set title(value);
+    get title(): string;
+    private set titleCount(value);
+    get titleCount(): number;
+    /**
+     * The key for an Alert that was shown as a result of an AJAX request error.
+     * If present, it will be dismissed on the next successful request.
+     */
+    private requestErrorAlert;
+    initialRoute: string;
+    load(payload: Application['data']): void;
     boot(): void;
-    bootExtensions(extensions: any): void;
-    mount(basePath?: string): void;
-    drawer: Drawer | undefined;
+    bootExtensions(extensions: Record<string, {
+        extend?: unknown[];
+    }>): void;
+    protected mount(basePath?: string): void;
     /**
      * Get the API response document that has been preloaded into the application.
-     *
-     * @return {Object|null}
-     * @public
      */
-    public preloadedApiDocument(): Object | null;
+    preloadedApiDocument<M extends Model>(): ApiResponseSingle<M> | null;
+    preloadedApiDocument<Ms extends Model[]>(): ApiResponsePlural<Ms[number]> | null;
     /**
      * Determine the current screen mode, based on our media queries.
-     *
-     * @returns {String} - one of "phone", "tablet", "desktop" or "desktop-hd"
      */
-    screen(): string;
+    screen(): FlarumScreens;
     /**
-     * Set the <title> of the page.
+     * Set the `<title>` of the page.
      *
-     * @param {String} title
-     * @public
+     * @param title New page title
      */
-    public setTitle(title: string): void;
+    setTitle(title: string): void;
     /**
-     * Set a number to display in the <title> of the page.
+     * Set a number to display in the `<title>` of the page.
      *
-     * @param {Integer} count
+     * @param count Number to display in title
      */
-    setTitleCount(count: any): void;
+    setTitleCount(count: number): void;
     updateTitle(): void;
+    protected transformRequestOptions<ResponseType>(flarumOptions: FlarumRequestOptions<ResponseType>): InternalFlarumRequestOptions<ResponseType>;
     /**
      * Make an AJAX request, handling any low-level errors that may occur.
      *
      * @see https://mithril.js.org/request.html
-     * @param {Object} options
+     *
+     * @param options
      * @return {Promise}
-     * @public
      */
-    public request(originalOptions: any): Promise<any>;
+    request<ResponseType>(originalOptions: FlarumRequestOptions<ResponseType>): Promise<ResponseType>;
     /**
-     * @param {RequestError} error
-     * @param {string[]} [formattedError]
-     * @private
+     * By default, show an error alert, and log the error to the console.
      */
+    protected requestErrorCatch<ResponseType>(error: RequestError, customErrorHandler: FlarumRequestOptions<ResponseType>['errorHandler']): Promise<never>;
+    protected requestErrorDefaultHandler(e: unknown, isDebug: boolean, formattedErrors: string[]): void;
     private showDebug;
     /**
      * Construct a URL to the route with the given name.
-     *
-     * @param {String} name
-     * @param {Object} params
-     * @return {String}
-     * @public
      */
-    public route(name: string, params?: Object): string;
+    route(name: string, params?: Record<string, unknown>): string;
 }
-import Forum from "./models/Forum";
-import ItemList from "./utils/ItemList";
-import Session from "./Session";
-import Translator from "./Translator";
-import Store from "./Store";
-import PageState from "./states/PageState";
-import ModalManagerState from "./states/ModalManagerState";
-import AlertManagerState from "./states/AlertManagerState";
-import Drawer from "./utils/Drawer";

js/dist-typings/common/Component.d.ts

@@ -1,4 +1,4 @@
-import * as Mithril from 'mithril';
+import type Mithril from 'mithril';
 export interface ComponentAttrs extends Mithril.Attributes {
 }
 /**
@@ -28,7 +28,7 @@ export interface ComponentAttrs extends Mithril.Attributes {
  *
  * @see https://mithril.js.org/components.html
  */
-export default abstract class Component<T extends ComponentAttrs = ComponentAttrs> implements Mithril.ClassComponent<T> {
+export default abstract class Component<Attrs extends ComponentAttrs = ComponentAttrs, State = undefined> implements Mithril.ClassComponent<Attrs> {
     /**
      * The root DOM element for the component.
      */
@@ -38,35 +38,47 @@ export default abstract class Component<T extends ComponentAttrs = ComponentAttr
      *
      * @see https://mithril.js.org/components.html#passing-data-to-components
      */
-    protected attrs: T;
+    protected attrs: Attrs;
+    /**
+     * Class component state that is persisted between redraws.
+     *
+     * Updating this will **not** automatically trigger a redraw, unlike
+     * other frameworks.
+     *
+     * This is different to Vnode state, which is always an instance of your
+     * class component.
+     *
+     * This is `undefined` by default.
+     */
+    protected state: State;
     /**
      * @inheritdoc
      */
-    abstract view(vnode: Mithril.Vnode<T, this>): Mithril.Children;
+    abstract view(vnode: Mithril.Vnode<Attrs, this>): Mithril.Children;
     /**
      * @inheritdoc
      */
-    oninit(vnode: Mithril.Vnode<T, this>): void;
+    oninit(vnode: Mithril.Vnode<Attrs, this>): void;
     /**
      * @inheritdoc
      */
-    oncreate(vnode: Mithril.VnodeDOM<T, this>): void;
+    oncreate(vnode: Mithril.VnodeDOM<Attrs, this>): void;
     /**
      * @inheritdoc
      */
-    onbeforeupdate(vnode: Mithril.VnodeDOM<T, this>): void;
+    onbeforeupdate(vnode: Mithril.VnodeDOM<Attrs, this>): void;
     /**
      * @inheritdoc
      */
-    onupdate(vnode: Mithril.VnodeDOM<T, this>): void;
+    onupdate(vnode: Mithril.VnodeDOM<Attrs, this>): void;
     /**
      * @inheritdoc
      */
-    onbeforeremove(vnode: Mithril.VnodeDOM<T, this>): void;
+    onbeforeremove(vnode: Mithril.VnodeDOM<Attrs, this>): void;
     /**
      * @inheritdoc
      */
-    onremove(vnode: Mithril.VnodeDOM<T, this>): void;
+    onremove(vnode: Mithril.VnodeDOM<Attrs, this>): void;
     /**
      * Returns a jQuery object for this component's element. If you pass in a
      * selector string, this method will return a jQuery object, using the current
@@ -87,7 +99,7 @@ export default abstract class Component<T extends ComponentAttrs = ComponentAttr
      *
      * @see https://mithril.js.org/hyperscript.html#mselector,-attributes,-children
      */
-    static component(attrs?: {}, children?: null): Mithril.Vnode;
+    static component<SAttrs extends ComponentAttrs = ComponentAttrs>(attrs?: SAttrs, children?: Mithril.Children): Mithril.Vnode;
     /**
      * Saves a reference to the vnode attrs after running them through initAttrs,
      * and checking for common issues.

js/dist-typings/common/Fragment.d.ts

@@ -1,4 +1,4 @@
-import * as Mithril from 'mithril';
+import type Mithril from 'mithril';
 /**
  * The `Fragment` class represents a chunk of DOM that is rendered once with Mithril and then takes
  * over control of its own DOM and lifecycle.
@@ -32,7 +32,7 @@ export default abstract class Fragment {
      * @returns {jQuery} the jQuery object for the DOM node
      * @final
      */
-    $(selector: any): JQuery<any>;
+    $(selector?: string): JQuery;
     /**
      * Get the renderable virtual DOM that represents the fragment's view.
      *

js/dist-typings/common/Model.d.ts

@@ -1,149 +1,147 @@
+import { FlarumRequestOptions } from './Application';
+import Store, { ApiPayloadSingle, ApiResponseSingle, MetaInformation } from './Store';
+export interface ModelIdentifier {
+    type: string;
+    id: string;
+}
+export interface ModelAttributes {
+    [key: string]: unknown;
+}
+export interface ModelRelationships {
+    [relationship: string]: {
+        data: ModelIdentifier | ModelIdentifier[];
+    };
+}
+export interface UnsavedModelData {
+    type?: string;
+    attributes?: ModelAttributes;
+    relationships?: ModelRelationships;
+}
+export interface SavedModelData {
+    type: string;
+    id: string;
+    attributes?: ModelAttributes;
+    relationships?: ModelRelationships;
+}
+export declare type ModelData = UnsavedModelData | SavedModelData;
+export interface SaveRelationships {
+    [relationship: string]: Model | Model[];
+}
+export interface SaveAttributes {
+    [key: string]: unknown;
+    relationships?: SaveRelationships;
+}
 /**
  * The `Model` class represents a local data resource. It provides methods to
  * persist changes via the API.
- *
- * @abstract
  */
-export default class Model {
-    /**
-     * Generate a function which returns the value of the given attribute.
-     *
-     * @param {String} name
-     * @param {function} [transform] A function to transform the attribute value
-     * @return {*}
-     * @public
-     */
-    public static attribute(name: string, transform?: Function | undefined): any;
-    /**
-     * Generate a function which returns the value of the given has-one
-     * relationship.
-     *
-     * @param {String} name
-     * @return {Model|Boolean|undefined} false if no information about the
-     *     relationship exists; undefined if the relationship exists but the model
-     *     has not been loaded; or the model if it has been loaded.
-     * @public
-     */
-    public static hasOne(name: string): Model | boolean | undefined;
-    /**
-     * Generate a function which returns the value of the given has-many
-     * relationship.
-     *
-     * @param {String} name
-     * @return {Array|Boolean} false if no information about the relationship
-     *     exists; an array if it does, containing models if they have been
-     *     loaded, and undefined for those that have not.
-     * @public
-     */
-    public static hasMany(name: string): any[] | boolean;
-    /**
-     * Transform the given value into a Date object.
-     *
-     * @param {String} value
-     * @return {Date|null}
-     * @public
-     */
-    public static transformDate(value: string): Date | null;
-    /**
-     * Get a resource identifier object for the given model.
-     *
-     * @param {Model} model
-     * @return {Object}
-     * @protected
-     */
-    protected static getIdentifier(model: Model): Object;
-    /**
-     * @param {Object} data A resource object from the API.
-     * @param {Store} store The data store that this model should be persisted to.
-     * @public
-     */
-    constructor(data?: Object, store?: any);
+export default abstract class Model {
     /**
      * The resource object from the API.
-     *
-     * @type {Object}
-     * @public
      */
-    public data: Object;
+    data: ModelData;
     /**
      * The time at which the model's data was last updated. Watching the value
      * of this property is a fast way to retain/cache a subtree if data hasn't
      * changed.
-     *
-     * @type {Date}
-     * @public
      */
-    public freshness: Date;
+    freshness: Date;
     /**
      * Whether or not the resource exists on the server.
-     *
-     * @type {Boolean}
-     * @public
      */
-    public exists: boolean;
+    exists: boolean;
     /**
      * The data store that this resource should be persisted to.
-     *
-     * @type {Store}
-     * @protected
      */
-    protected store: any;
+    protected store: Store;
+    /**
+     * @param data A resource object from the API.
+     * @param store The data store that this model should be persisted to.
+     */
+    constructor(data?: ModelData, store?: Store);
     /**
      * Get the model's ID.
      *
-     * @return {Integer}
-     * @public
      * @final
      */
-    public id(): any;
+    id(): string | undefined;
     /**
      * Get one of the model's attributes.
      *
-     * @param {String} attribute
-     * @return {*}
-     * @public
      * @final
      */
-    public attribute(attribute: string): any;
+    attribute<T = unknown>(attribute: string): T;
     /**
      * Merge new data into this model locally.
      *
-     * @param {Object} data A resource object to merge into this model
-     * @public
+     * @param data A resource object to merge into this model
      */
-    public pushData(data: Object): void;
+    pushData(data: ModelData | {
+        relationships?: SaveRelationships;
+    }): this;
     /**
      * Merge new attributes into this model locally.
      *
-     * @param {Object} attributes The attributes to merge.
-     * @public
+     * @param attributes The attributes to merge.
      */
-    public pushAttributes(attributes: Object): void;
+    pushAttributes(attributes: ModelAttributes): void;
     /**
      * Merge new attributes into this model, both locally and with persistence.
      *
-     * @param {Object} attributes The attributes to save. If a 'relationships' key
+     * @param attributes The attributes to save. If a 'relationships' key
      *     exists, it will be extracted and relationships will also be saved.
-     * @param {Object} [options]
-     * @return {Promise}
-     * @public
      */
-    public save(attributes: Object, options?: Object | undefined): Promise<any>;
+    save(attributes: SaveAttributes, options?: Omit<FlarumRequestOptions<ApiPayloadSingle>, 'url'> & {
+        meta?: MetaInformation;
+    }): Promise<ApiResponseSingle<this>>;
     /**
      * Send a request to delete the resource.
      *
-     * @param {Object} body Data to send along with the DELETE request.
-     * @param {Object} [options]
-     * @return {Promise}
-     * @public
+     * @param body Data to send along with the DELETE request.
      */
-    public delete(body: Object, options?: Object | undefined): Promise<any>;
+    delete(body?: FlarumRequestOptions<void>['body'], options?: Omit<FlarumRequestOptions<void>, 'url'>): Promise<void>;
     /**
      * Construct a path to the API endpoint for this resource.
-     *
-     * @return {String}
-     * @protected
      */
     protected apiEndpoint(): string;
-    copyData(): any;
+    protected copyData(): ModelData;
+    protected rawRelationship<M extends Model>(relationship: string): undefined | ModelIdentifier;
+    protected rawRelationship<M extends Model[]>(relationship: string): undefined | ModelIdentifier[];
+    /**
+     * Generate a function which returns the value of the given attribute.
+     *
+     * @param transform A function to transform the attribute value
+     */
+    static attribute<T>(name: string): () => T;
+    static attribute<T, O = unknown>(name: string, transform: (attr: O) => T): () => T;
+    /**
+     * Generate a function which returns the value of the given has-one
+     * relationship.
+     *
+     * @return false if no information about the
+     *     relationship exists; undefined if the relationship exists but the model
+     *     has not been loaded; or the model if it has been loaded.
+     */
+    static hasOne<M extends Model>(name: string): () => M | false;
+    static hasOne<M extends Model | null>(name: string): () => M | null | false;
+    /**
+     * Generate a function which returns the value of the given has-many
+     * relationship.
+     *
+     * @return false if no information about the relationship
+     *     exists; an array if it does, containing models if they have been
+     *     loaded, and undefined for those that have not.
+     */
+    static hasMany<M extends Model>(name: string): () => (M | undefined)[] | false;
+    /**
+     * Transform the given value into a Date object.
+     */
+    static transformDate(value: string): Date;
+    static transformDate(value: string | null): Date | null;
+    static transformDate(value: string | undefined): Date | undefined;
+    static transformDate(value: string | null | undefined): Date | null | undefined;
+    /**
+     * Get a resource identifier object for the given model.
+     */
+    protected static getIdentifier(model: Model): ModelIdentifier;
 }

js/dist-typings/common/Session.d.ts

@@ -1,37 +1,33 @@
+import User from './models/User';
+import { FlarumRequestOptions } from './Application';
+export declare type LoginParams = {
+    /**
+     * The username/email
+     */
+    identification: string;
+    password: string;
+    remember: boolean;
+};
 /**
  * The `Session` class defines the current user session. It stores a reference
  * to the current authenticated user, and provides methods to log in/out.
  */
 export default class Session {
-    constructor(user: any, csrfToken: any);
     /**
      * The current authenticated user.
-     *
-     * @type {User|null}
-     * @public
      */
-    public user: any | null;
+    user: User | null;
     /**
      * The CSRF token.
-     *
-     * @type {String|null}
-     * @public
      */
-    public csrfToken: string | null;
+    csrfToken: string;
+    constructor(user: User | null, csrfToken: string);
     /**
      * Attempt to log in a user.
-     *
-     * @param {String} identification The username/email.
-     * @param {String} password
-     * @param {Object} [options]
-     * @return {Promise}
-     * @public
      */
-    public login(body: any, options?: Object | undefined): Promise<any>;
+    login(body: LoginParams, options?: Omit<FlarumRequestOptions<any>, 'url' | 'body' | 'method'>): Promise<any>;
     /**
      * Log the user out.
-     *
-     * @public
      */
-    public logout(): void;
+    logout(): void;
 }

js/dist-typings/common/Store.d.ts

@@ -1,97 +1,127 @@
+import { FlarumRequestOptions } from './Application';
+import Model, { ModelData, SavedModelData } from './Model';
+export interface MetaInformation {
+    [key: string]: any;
+}
+export interface ApiQueryParamsSingle {
+    fields?: string[];
+    include?: string;
+    bySlug?: boolean;
+    meta?: MetaInformation;
+}
+export interface ApiQueryParamsPlural {
+    fields?: string[];
+    include?: string;
+    filter?: {
+        q: string;
+        [key: string]: string;
+    };
+    page?: {
+        offset?: number;
+        number?: number;
+        limit?: number;
+        size?: number;
+    };
+    sort?: string;
+    meta?: MetaInformation;
+}
+export declare type ApiQueryParams = ApiQueryParamsPlural | ApiQueryParamsSingle;
+export interface ApiPayloadSingle {
+    data: SavedModelData;
+    included?: SavedModelData[];
+    meta?: MetaInformation;
+}
+export interface ApiPayloadPlural {
+    data: SavedModelData[];
+    included?: SavedModelData[];
+    links?: {
+        first: string;
+        next?: string;
+        prev?: string;
+    };
+    meta?: MetaInformation;
+}
+export declare type ApiPayload = ApiPayloadSingle | ApiPayloadPlural;
+export declare type ApiResponseSingle<M extends Model> = M & {
+    payload: ApiPayloadSingle;
+};
+export declare type ApiResponsePlural<M extends Model> = M[] & {
+    payload: ApiPayloadPlural;
+};
+export declare type ApiResponse<M extends Model> = ApiResponseSingle<M> | ApiResponsePlural<M>;
+interface ApiQueryRequestOptions<ResponseType> extends Omit<FlarumRequestOptions<ResponseType>, 'url'> {
+}
+interface StoreData {
+    [type: string]: Partial<Record<string, Model>>;
+}
+export declare function payloadIsPlural(payload: ApiPayload): payload is ApiPayloadPlural;
 /**
  * The `Store` class defines a local data store, and provides methods to
  * retrieve data from the API.
  */
 export default class Store {
-    constructor(models: any);
     /**
      * The local data store. A tree of resource types to IDs, such that
      * accessing data[type][id] will return the model for that type/ID.
-     *
-     * @type {Object}
-     * @protected
      */
-    protected data: Object;
+    protected data: StoreData;
     /**
      * The model registry. A map of resource types to the model class that
      * should be used to represent resources of that type.
-     *
-     * @type {Object}
-     * @public
      */
-    public models: Object;
+    models: Record<string, typeof Model>;
+    constructor(models: Record<string, typeof Model>);
     /**
      * Push resources contained within an API payload into the store.
      *
-     * @param {Object} payload
-     * @return {Model|Model[]} The model(s) representing the resource(s) contained
+     * @return The model(s) representing the resource(s) contained
      *     within the 'data' key of the payload.
-     * @public
      */
-    public pushPayload(payload: Object): any | any[];
+    pushPayload<M extends Model>(payload: ApiPayloadSingle): ApiResponseSingle<M>;
+    pushPayload<Ms extends Model[]>(payload: ApiPayloadPlural): ApiResponseSingle<Ms[number]>;
     /**
      * Create a model to represent a resource object (or update an existing one),
      * and push it into the store.
      *
-     * @param {Object} data The resource object
-     * @return {Model|null} The model, or null if no model class has been
+     * @param data The resource object
+     * @return The model, or null if no model class has been
      *     registered for this resource type.
-     * @public
      */
-    public pushObject(data: Object): any | null;
+    pushObject<M extends Model>(data: SavedModelData): M | null;
+    pushObject<M extends Model>(data: SavedModelData, allowUnregistered: false): M;
     /**
      * Make a request to the API to find record(s) of a specific type.
-     *
-     * @param {String} type The resource type.
-     * @param {Integer|Integer[]|Object} [id] The ID(s) of the model(s) to retrieve.
-     *     Alternatively, if an object is passed, it will be handled as the
-     *     `query` parameter.
-     * @param {Object} [query]
-     * @param {Object} [options]
-     * @return {Promise}
-     * @public
      */
-    public find(type: string, id?: any | any[] | Object, query?: Object | undefined, options?: Object | undefined): Promise<any>;
+    find<M extends Model>(type: string, params: ApiQueryParamsSingle): Promise<ApiResponseSingle<M>>;
+    find<Ms extends Model[]>(type: string, params: ApiQueryParamsPlural): Promise<ApiResponsePlural<Ms[number]>>;
+    find<M extends Model>(type: string, id: string, params?: ApiQueryParamsSingle, options?: ApiQueryRequestOptions<ApiPayloadSingle>): Promise<ApiResponseSingle<M>>;
+    find<Ms extends Model[]>(type: string, ids: string[], params?: ApiQueryParamsPlural, options?: ApiQueryRequestOptions<ApiPayloadPlural>): Promise<ApiResponsePlural<Ms[number]>>;
     /**
      * Get a record from the store by ID.
-     *
-     * @param {String} type The resource type.
-     * @param {Integer} id The resource ID.
-     * @return {Model}
-     * @public
      */
-    public getById(type: string, id: any): any;
+    getById<M extends Model>(type: string, id: string): M | undefined;
     /**
      * Get a record from the store by the value of a model attribute.
      *
-     * @param {String} type The resource type.
-     * @param {String} key The name of the method on the model.
-     * @param {*} value The value of the model attribute.
-     * @return {Model}
-     * @public
+     * @param type The resource type.
+     * @param key The name of the method on the model.
+     * @param value The value of the model attribute.
      */
-    public getBy(type: string, key: string, value: any): any;
+    getBy<M extends Model, T = unknown>(type: string, key: keyof M, value: T): M | undefined;
     /**
      * Get all loaded records of a specific type.
-     *
-     * @param {String} type
-     * @return {Model[]}
-     * @public
      */
-    public all(type: string): any[];
+    all<M extends Model>(type: string): M[];
     /**
      * Remove the given model from the store.
-     *
-     * @param {Model} model
      */
-    remove(model: any): void;
+    remove(model: Model): void;
     /**
      * Create a new record of the given type.
      *
-     * @param {String} type The resource type
-     * @param {Object} [data] Any data to initialize the model with
-     * @return {Model}
-     * @public
+     * @param type The resource type
+     * @param data Any data to initialize the model with
      */
-    public createRecord(type: string, data?: Object | undefined): any;
+    createRecord<M extends Model>(type: string, data?: ModelData): M;
 }
+export {};

js/dist-typings/common/Translator.d.ts

@@ -1,3 +1,6 @@
+/// <reference path="../../src/common/translator-icu-rich.d.ts" />
+import { RichMessageFormatter } from '@askvortsov/rich-icu-message-formatter';
+import { pluralTypeHandler, selectTypeHandler } from '@ultraq/icu-message-formatter';
 declare type Translations = Record<string, string>;
 declare type TranslatorParameters = Record<string, unknown>;
 export default class Translator {
@@ -8,15 +11,15 @@ export default class Translator {
     /**
      * The underlying ICU MessageFormatter util.
      */
-    protected formatter: any;
+    protected formatter: RichMessageFormatter;
     setLocale(locale: string): void;
     addTranslations(translations: Translations): void;
     /**
      * An extensible entrypoint for extenders to register type handlers for translations.
      */
     protected formatterTypeHandlers(): {
-        plural: any;
-        select: any;
+        plural: typeof pluralTypeHandler;
+        select: typeof selectTypeHandler;
     };
     /**
      * A temporary system to preprocess parameters.
@@ -26,6 +29,6 @@ export default class Translator {
      * @internal
      */
     protected preprocessParameters(parameters: TranslatorParameters): TranslatorParameters;
-    trans(id: string, parameters?: TranslatorParameters): any;
+    trans(id: string, parameters?: TranslatorParameters): import("@askvortsov/rich-icu-message-formatter").NestedStringArray;
 }
 export {};

js/dist-typings/common/app.d.ts

@@ -0,0 +1,6 @@
+import type Application from './Application';
+declare const _default: Application;
+/**
+ * The instance of Application within the common namespace.
+ */
+export default _default;

js/dist-typings/common/compat.d.ts

@@ -1,5 +1,5 @@
 declare var _default: {
-    extend: typeof extend;
+    extend: any;
     Session: typeof Session;
     Store: typeof Store;
     'utils/BasicEditorDriver': typeof BasicEditorDriver;
@@ -32,17 +32,15 @@ declare var _default: {
     'utils/subclassOf': typeof subclassOf;
     'utils/setRouteWithForcedRefresh': typeof setRouteWithForcedRefresh;
     'utils/patchMithril': typeof patchMithril;
-    'utils/proxifyCompat': (compat: {
-        [key: string]: any;
-    }, namespace: string) => {
-        [key: string]: any;
-    };
+    'utils/proxifyCompat': typeof proxifyCompat;
     'utils/classList': (...classes: import("clsx").ClassValue[]) => string;
     'utils/extractText': typeof extractText;
     'utils/formatNumber': typeof formatNumber;
     'utils/mapRoutes': typeof mapRoutes;
     'utils/withAttr': (key: string, cb: Function) => (this: Element) => void;
     'utils/throttleDebounce': typeof ThrottleDebounce;
+    'utils/isObject': typeof isObject;
+    'utils/focusTrap': typeof FocusTrap;
     'models/Notification': typeof Notification;
     'models/User': typeof User;
     'models/Post': typeof Post;
@@ -69,6 +67,7 @@ declare var _default: {
     'components/Link': typeof Link;
     'components/LinkButton': typeof LinkButton;
     'components/Checkbox': typeof Checkbox;
+    'components/ColorPreviewInput': typeof ColorPreviewInput;
     'components/SelectDropdown': typeof SelectDropdown;
     'components/ModalManager': typeof ModalManager;
     'components/Button': typeof Button;
@@ -93,7 +92,6 @@ declare var _default: {
     'states/PaginatedListState': typeof PaginatedListState;
 };
 export default _default;
-import * as extend from "./extend";
 import Session from "./Session";
 import Store from "./Store";
 import BasicEditorDriver from "./utils/BasicEditorDriver";
@@ -118,10 +116,13 @@ import Stream from "./utils/Stream";
 import subclassOf from "./utils/subclassOf";
 import setRouteWithForcedRefresh from "./utils/setRouteWithForcedRefresh";
 import patchMithril from "./utils/patchMithril";
+import proxifyCompat from "./utils/proxifyCompat";
 import extractText from "./utils/extractText";
 import formatNumber from "./utils/formatNumber";
 import mapRoutes from "./utils/mapRoutes";
 import * as ThrottleDebounce from "./utils/throttleDebounce";
+import isObject from "./utils/isObject";
+import * as FocusTrap from "./utils/focusTrap";
 import Notification from "./models/Notification";
 import User from "./models/User";
 import Post from "./models/Post";
@@ -148,6 +149,7 @@ import Alert from "./components/Alert";
 import Link from "./components/Link";
 import LinkButton from "./components/LinkButton";
 import Checkbox from "./components/Checkbox";
+import ColorPreviewInput from "./components/ColorPreviewInput";
 import SelectDropdown from "./components/SelectDropdown";
 import ModalManager from "./components/ModalManager";
 import Button from "./components/Button";

js/dist-typings/common/components/Alert.d.ts

@@ -1,5 +1,5 @@
 import Component, { ComponentAttrs } from '../Component';
-import Mithril from 'mithril';
+import type Mithril from 'mithril';
 export interface AlertAttrs extends ComponentAttrs {
     /** The type of alert this is. Will be used to give the alert a class name of `Alert--{type}`. */
     type?: string;
@@ -15,5 +15,5 @@ export interface AlertAttrs extends ComponentAttrs {
  * some controls, and may be dismissible.
  */
 export default class Alert<T extends AlertAttrs = AlertAttrs> extends Component<T> {
-    view(vnode: Mithril.Vnode): JSX.Element;
+    view(vnode: Mithril.VnodeDOM<T, this>): JSX.Element;
 }

js/dist-typings/common/components/AlertManager.d.ts

@@ -2,8 +2,7 @@
  * The `AlertManager` component provides an area in which `Alert` components can
  * be shown and dismissed.
  */
-export default class AlertManager extends Component<import("../Component").ComponentAttrs> {
+export default class AlertManager extends Component<import("../Component").ComponentAttrs, undefined> {
     constructor();
-    state: any;
 }
 import Component from "../Component";

js/dist-typings/common/components/Badge.d.ts

@@ -11,7 +11,7 @@
  *
  * All other attrs will be assigned as attributes on the badge element.
  */
-export default class Badge extends Component<import("../Component").ComponentAttrs> {
+export default class Badge extends Component<import("../Component").ComponentAttrs, undefined> {
     constructor();
 }
 import Component from "../Component";

js/dist-typings/common/components/Button.d.ts

@@ -1,29 +1,69 @@
+import type Mithril from 'mithril';
+import Component, { ComponentAttrs } from '../Component';
+export interface IButtonAttrs extends ComponentAttrs {
+    /**
+     * Class(es) of an optional icon to be rendered within the button.
+     *
+     * If provided, the button will gain a `has-icon` class.
+     */
+    icon?: string;
+    /**
+     * Disables button from user input.
+     *
+     * Default: `false`
+     */
+    disabled?: boolean;
+    /**
+     * Show a loading spinner within the button.
+     *
+     * If `true`, also disables the button.
+     *
+     * Default: `false`
+     */
+    loading?: boolean;
+    /**
+     * **DEPRECATED:** Please use the `aria-label` attribute instead. For tooltips, use
+     * the `<Tooltip>` component.
+     *
+     * Accessible text for the button. This should always be present if the button only
+     * contains an icon.
+     *
+     * The textual content of this attribute is passed to the DOM element as `aria-label`.
+     *
+     * @deprecated
+     */
+    title?: string | Mithril.ChildArray;
+    /**
+     * Accessible text for the button. This should always be present if the button only
+     * contains an icon.
+     *
+     * The textual content of this attribute is passed to the DOM element as `aria-label`.
+     */
+    'aria-label'?: string | Mithril.ChildArray;
+    /**
+     * Button type.
+     *
+     * Default: `"button"`
+     *
+     * @see https://developer.mozilla.org/en-US/docs/Web/HTML/Element/button#attr-type
+     */
+    type?: string;
+}
 /**
  * The `Button` component defines an element which, when clicked, performs an
  * action.
  *
- * ### Attrs
- *
- * - `icon` The name of the icon class. If specified, the button will be given a
- *   'has-icon' class name.
- * - `disabled` Whether or not the button is disabled. If truthy, the button
- *   will be given a 'disabled' class name, and any `onclick` handler will be
- *   removed.
- * - `loading` Whether or not the button should be in a disabled loading state.
- *
- * All other attrs will be assigned as attributes on the button element.
+ * Other attrs will be assigned as attributes on the `<button>` element.
  *
  * Note that a Button has no default class names. This is because a Button can
- * be used to represent any generic clickable control, like a menu item.
+ * be used to represent any generic clickable control, like a menu item. Common
+ * styles can be applied by providing `className="Button"` to the Button component.
  */
-export default class Button extends Component<import("../Component").ComponentAttrs> {
-    constructor();
+export default class Button<CustomAttrs extends IButtonAttrs = IButtonAttrs> extends Component<CustomAttrs> {
+    view(vnode: Mithril.VnodeDOM<CustomAttrs, this>): JSX.Element;
+    oncreate(vnode: Mithril.VnodeDOM<CustomAttrs, this>): void;
     /**
      * Get the template for the button's content.
-     *
-     * @return {*}
-     * @protected
      */
-    protected getButtonContent(children: any): any;
+    protected getButtonContent(children: Mithril.Children): Mithril.ChildArray;
 }
-import Component from "../Component";

js/dist-typings/common/components/Checkbox.d.ts

@@ -10,7 +10,7 @@
  * - `onchange` A callback to run when the checkbox is checked/unchecked.
  * - `children` A text label to display next to the checkbox.
  */
-export default class Checkbox extends Component<import("../Component").ComponentAttrs> {
+export default class Checkbox extends Component<import("../Component").ComponentAttrs, undefined> {
     constructor();
     /**
      * Get the template for the checkbox's display (tick/cross icon).

js/dist-typings/common/components/ColorPreviewInput.d.ts

@@ -0,0 +1,6 @@
+import type Mithril from 'mithril';
+import Component, { ComponentAttrs } from '../Component';
+export default class ColorPreviewInput extends Component {
+    value?: string;
+    view(vnode: Mithril.Vnode<ComponentAttrs, this>): JSX.Element;
+}

js/dist-typings/common/components/ConfirmDocumentUnload.d.ts

@@ -14,7 +14,7 @@
  * another component / DOM element.)
  *
  */
-export default class ConfirmDocumentUnload extends Component<import("../Component").ComponentAttrs> {
+export default class ConfirmDocumentUnload extends Component<import("../Component").ComponentAttrs, undefined> {
     constructor();
     handler(): any;
     boundHandler: (() => any) | undefined;

js/dist-typings/common/components/Dropdown.d.ts

@@ -15,7 +15,7 @@
  *
  * The children will be displayed as a list inside of the dropdown menu.
  */
-export default class Dropdown extends Component<import("../Component").ComponentAttrs> {
+export default class Dropdown extends Component<import("../Component").ComponentAttrs, undefined> {
     static initAttrs(attrs: any): void;
     constructor();
     showing: boolean | undefined;

js/dist-typings/common/components/EditUserModal.d.ts

@@ -1,25 +1,31 @@
-/**
- * The `EditUserModal` component displays a modal dialog with a login form.
- */
-export default class EditUserModal extends Modal {
-    username: Stream<any> | undefined;
-    email: Stream<any> | undefined;
-    isEmailConfirmed: Stream<any> | undefined;
-    setPassword: Stream<boolean> | undefined;
-    password: Stream<any> | undefined;
-    groups: {} | undefined;
-    fields(): ItemList;
+/// <reference path="../../../src/common/translator-icu-rich.d.ts" />
+import Modal, { IInternalModalAttrs } from './Modal';
+import ItemList from '../utils/ItemList';
+import Stream from '../utils/Stream';
+import type Mithril from 'mithril';
+import type User from '../models/User';
+import type { SaveAttributes } from '../Model';
+export interface IEditUserModalAttrs extends IInternalModalAttrs {
+    user: User;
+}
+export default class EditUserModal<CustomAttrs extends IEditUserModalAttrs = IEditUserModalAttrs> extends Modal<CustomAttrs> {
+    protected username: Stream<string>;
+    protected email: Stream<string>;
+    protected isEmailConfirmed: Stream<boolean>;
+    protected setPassword: Stream<boolean>;
+    protected password: Stream<string>;
+    protected groups: Record<string, Stream<boolean>>;
+    oninit(vnode: Mithril.Vnode<CustomAttrs, this>): void;
+    className(): string;
+    title(): import("@askvortsov/rich-icu-message-formatter").NestedStringArray;
+    content(): JSX.Element;
+    fields(): ItemList<unknown>;
     activate(): void;
-    data(): {
-        relationships: {};
-    };
-    nonAdminEditingAdmin(): any;
+    data(): SaveAttributes;
+    onsubmit(e: SubmitEvent): void;
+    nonAdminEditingAdmin(): boolean | null;
     /**
      * @internal
-     * @protected
      */
-    protected userIsAdmin(user: any): any;
+    protected userIsAdmin(user: User | null): boolean | null;
 }
-import Modal from "./Modal";
-import Stream from "../utils/Stream";
-import ItemList from "../utils/ItemList";

js/dist-typings/common/components/FieldSet.d.ts

@@ -7,7 +7,7 @@
  *
  * The children should be an array of items to show in the fieldset.
  */
-export default class FieldSet extends Component<import("../Component").ComponentAttrs> {
+export default class FieldSet extends Component<import("../Component").ComponentAttrs, undefined> {
     constructor();
 }
 import Component from "../Component";

js/dist-typings/common/components/Link.d.ts

@@ -6,7 +6,7 @@
  * Links will default to internal; the 'external' attr must be set to
  * `true` for the link to be external.
  */
-export default class Link extends Component<import("../Component").ComponentAttrs> {
+export default class Link extends Component<import("../Component").ComponentAttrs, undefined> {
     constructor();
 }
 import Component from "../Component";

js/dist-typings/common/components/LinkButton.d.ts

@@ -11,7 +11,7 @@
  *   the `active` prop will automatically be set to true.
  * - `force` Whether the page should be fully rerendered. Defaults to `true`.
  */
-export default class LinkButton extends Button {
+export default class LinkButton extends Button<import("./Button").IButtonAttrs> {
     static initAttrs(attrs: any): void;
     /**
      * Determine whether a component with the given attrs is 'active'.
@@ -20,5 +20,6 @@ export default class LinkButton extends Button {
      * @return {Boolean}
      */
     static isActive(attrs: Object): boolean;
+    constructor();
 }
 import Button from "./Button";

js/dist-typings/common/components/Modal.d.ts

@@ -1,67 +1,68 @@
+import Component from '../Component';
+import { AlertAttrs } from './Alert';
+import type Mithril from 'mithril';
+import type ModalManagerState from '../states/ModalManagerState';
+import type RequestError from '../utils/RequestError';
+import type ModalManager from './ModalManager';
+export interface IInternalModalAttrs {
+    state: ModalManagerState;
+    animateShow: ModalManager['animateShow'];
+    animateHide: ModalManager['animateHide'];
+}
 /**
  * The `Modal` component displays a modal dialog, wrapped in a form. Subclasses
  * should implement the `className`, `title`, and `content` methods.
- *
- * @abstract
  */
-export default class Modal extends Component<import("../Component").ComponentAttrs> {
+export default abstract class Modal<ModalAttrs extends IInternalModalAttrs = IInternalModalAttrs> extends Component<ModalAttrs> {
     /**
      * Determine whether or not the modal should be dismissible via an 'x' button.
      */
-    static isDismissible: boolean;
-    constructor();
+    static readonly isDismissible: boolean;
+    protected loading: boolean;
     /**
      * Attributes for an alert component to show below the header.
-     *
-     * @type {object}
      */
-    alertAttrs: object;
+    alertAttrs: AlertAttrs | null;
+    oninit(vnode: Mithril.Vnode<ModalAttrs, this>): void;
+    oncreate(vnode: Mithril.VnodeDOM<ModalAttrs, this>): void;
+    onbeforeremove(vnode: Mithril.VnodeDOM<ModalAttrs, this>): Promise<void> | void;
+    /**
+     * @todo split into FormModal and Modal in 2.0
+     */
+    view(): JSX.Element;
     /**
      * Get the class name to apply to the modal.
-     *
-     * @return {String}
-     * @abstract
      */
-    className(): string;
+    abstract className(): string;
     /**
      * Get the title of the modal dialog.
-     *
-     * @return {String}
-     * @abstract
      */
-    title(): string;
+    abstract title(): Mithril.Children;
     /**
      * Get the content of the modal.
-     *
-     * @return {VirtualElement}
-     * @abstract
      */
-    content(): any;
+    abstract content(): Mithril.Children;
     /**
      * Handle the modal form's submit event.
-     *
-     * @param {Event} e
      */
-    onsubmit(): void;
+    onsubmit(e: SubmitEvent): void;
     /**
-     * Focus on the first input when the modal is ready to be used.
+     * Callback executed when the modal is shown and ready to be interacted with.
+     *
+     * @remark Focuses the first input in the modal.
      */
     onready(): void;
     /**
-     * Hide the modal.
+     * Hides the modal.
      */
     hide(): void;
     /**
-     * Stop loading.
+     * Sets `loading` to false and triggers a redraw.
      */
     loaded(): void;
-    loading: boolean | undefined;
     /**
-     * Show an alert describing an error returned from the API, and give focus to
-     * the first relevant field.
-     *
-     * @param {RequestError} error
+     * Shows an alert describing an error returned from the API, and gives focus to
+     * the first relevant field involved in the error.
      */
-    onerror(error: any): void;
+    onerror(error: RequestError): void;
 }
-import Component from "../Component";

js/dist-typings/common/components/ModalManager.d.ts

@@ -1,11 +1,25 @@
+import Component from '../Component';
+import { FocusTrap } from '../utils/focusTrap';
+import type ModalManagerState from '../states/ModalManagerState';
+import type Mithril from 'mithril';
+interface IModalManagerAttrs {
+    state: ModalManagerState;
+}
 /**
  * The `ModalManager` component manages a modal dialog. Only one modal dialog
  * can be shown at once; loading a new component into the ModalManager will
  * overwrite the previous one.
  */
-export default class ModalManager extends Component<import("../Component").ComponentAttrs> {
-    constructor();
-    animateShow(readyCallback: any): void;
+export default class ModalManager extends Component<IModalManagerAttrs> {
+    protected focusTrap: FocusTrap | undefined;
+    /**
+     * Whether a modal is currently shown by this modal manager.
+     */
+    protected modalShown: boolean;
+    view(vnode: Mithril.VnodeDOM<IModalManagerAttrs, this>): Mithril.Children;
+    oncreate(vnode: Mithril.VnodeDOM<IModalManagerAttrs, this>): void;
+    onupdate(vnode: Mithril.VnodeDOM<IModalManagerAttrs, this>): void;
+    animateShow(readyCallback: () => void): void;
     animateHide(): void;
 }
-import Component from "../Component";
+export {};

js/dist-typings/common/components/Navigation.d.ts

@@ -13,7 +13,7 @@
  * - `drawer` Whether or not to show a button to toggle the app's drawer if
  *   there is no more history to pop.
  */
-export default class Navigation extends Component<import("../Component").ComponentAttrs> {
+export default class Navigation extends Component<import("../Component").ComponentAttrs, undefined> {
     constructor();
     /**
      * Get the back button.

js/dist-typings/common/components/Page.d.ts

@@ -1,27 +1,28 @@
+import type Mithril from 'mithril';
+import Component from '../Component';
+export interface IPageAttrs {
+    key?: number;
+    routeName: string;
+}
 /**
  * The `Page` component
  *
  * @abstract
  */
-export default class Page extends Component<import("../Component").ComponentAttrs> {
-    constructor();
+export default abstract class Page<CustomAttrs extends IPageAttrs = IPageAttrs> extends Component<CustomAttrs> {
     /**
      * A class name to apply to the body while the route is active.
-     *
-     * @type {String}
      */
-    bodyClass: string | undefined;
+    protected bodyClass: string;
     /**
      * Whether we should scroll to the top of the page when its rendered.
-     *
-     * @type {Boolean}
      */
-    scrollTopOnCreate: boolean | undefined;
+    protected scrollTopOnCreate: boolean;
     /**
      * Whether the browser should restore scroll state on refreshes.
-     *
-     * @type {Boolean}
      */
-    useBrowserScrollRestoration: boolean | undefined;
+    protected useBrowserScrollRestoration: boolean;
+    oninit(vnode: Mithril.Vnode<CustomAttrs, this>): void;
+    oncreate(vnode: Mithril.VnodeDOM<CustomAttrs, this>): void;
+    onremove(vnode: Mithril.VnodeDOM<CustomAttrs, this>): void;
 }
-import Component from "../Component";

js/dist-typings/common/components/Placeholder.d.ts

@@ -6,7 +6,7 @@
  *
  * - `text`
  */
-export default class Placeholder extends Component<import("../Component").ComponentAttrs> {
+export default class Placeholder extends Component<import("../Component").ComponentAttrs, undefined> {
     constructor();
 }
 import Component from "../Component";

js/dist-typings/common/components/RequestErrorModal.d.ts

@@ -1,3 +1,12 @@
-export default class RequestErrorModal extends Modal {
+/// <reference types="mithril" />
+import type RequestError from '../utils/RequestError';
+import Modal, { IInternalModalAttrs } from './Modal';
+export interface IRequestErrorModalAttrs extends IInternalModalAttrs {
+    error: RequestError;
+    formattedError: string[];
+}
+export default class RequestErrorModal<CustomAttrs extends IRequestErrorModalAttrs = IRequestErrorModalAttrs> extends Modal<CustomAttrs> {
+    className(): string;
+    title(): string;
+    content(): JSX.Element;
 }
-import Modal from "./Modal";

js/dist-typings/common/components/Select.d.ts

@@ -6,8 +6,11 @@
  * - `onchange` A callback to run when the selected value is changed.
  * - `value` The value of the selected option.
  * - `disabled` Disabled state for the input.
+ * - `wrapperAttrs` A map of attrs to be passed to the DOM element wrapping the `<select>`
+ *
+ * Other attributes are passed directly to the `<select>` element rendered to the DOM.
  */
-export default class Select extends Component<import("../Component").ComponentAttrs> {
+export default class Select extends Component<import("../Component").ComponentAttrs, undefined> {
     constructor();
 }
 import Component from "../Component";

js/dist-typings/common/components/Separator.d.ts

@@ -2,7 +2,7 @@ export default Separator;
 /**
  * The `Separator` component defines a menu separator item.
  */
-declare class Separator extends Component<import("../Component").ComponentAttrs> {
+declare class Separator extends Component<import("../Component").ComponentAttrs, undefined> {
     constructor();
 }
 declare namespace Separator {

js/dist-typings/common/components/TextEditor.d.ts

@@ -11,7 +11,7 @@
  * - `disabled`
  * - `preview`
  */
-export default class TextEditor extends Component<import("../Component").ComponentAttrs> {
+export default class TextEditor extends Component<import("../Component").ComponentAttrs, undefined> {
     constructor();
     /**
      * The value of the editor.
@@ -38,13 +38,13 @@ export default class TextEditor extends Component<import("../Component").Compone
      *
      * @return {ItemList}
      */
-    controlItems(): ItemList;
+    controlItems(): ItemList<any>;
     /**
      * Build an item list for the toolbar controls.
      *
      * @return {ItemList}
      */
-    toolbarItems(): ItemList;
+    toolbarItems(): ItemList<any>;
     /**
      * Handle input into the textarea.
      *

js/dist-typings/common/components/TextEditorButton.d.ts

@@ -1,8 +1,14 @@
 /**
  * The `TextEditorButton` component displays a button suitable for the text
  * editor toolbar.
+ *
+ * Automatically creates tooltips using the Tooltip component and provided text.
+ *
+ * ## Attrs
+ * - `title` - Tooltip for the button
  */
-export default class TextEditorButton extends Button {
+export default class TextEditorButton extends Button<import("./Button").IButtonAttrs> {
     static initAttrs(attrs: any): void;
+    constructor();
 }
 import Button from "./Button";

js/dist-typings/common/extend.d.ts

@@ -19,11 +19,11 @@
  *   // something that needs to be run on creation and update
  * });
  *
- * @param {object} object The object that owns the method
- * @param {string|string[]} methods The name or names of the method(s) to extend
- * @param {function} callback A callback which mutates the method's output
+ * @param object The object that owns the method
+ * @param methods The name or names of the method(s) to extend
+ * @param callback A callback which mutates the method's output
  */
-export function extend(object: object, methods: string | string[], callback: Function): void;
+export declare function extend<T extends object, K extends KeyOfType<T, Function>>(object: T, methods: K | K[], callback: (this: T, val: ReturnType<T[K]>, ...args: Parameters<T[K]>) => void): void;
 /**
  * Override an object's method by replacing it with a new function, so that the
  * new function will be run every time the object's method is called.
@@ -47,8 +47,8 @@ export function extend(object: object, methods: string | string[], callback: Fun
  *   // something that needs to be run on creation and update
  * });
  *
- * @param {object} object The object that owns the method
- * @param {string|string[]} method The name or names of the method(s) to override
- * @param {function} newMethod The method to replace it with
+ * @param object The object that owns the method
+ * @param methods The name or names of the method(s) to override
+ * @param newMethod The method to replace it with
  */
-export function override(object: object, methods: any, newMethod: Function): void;
+export declare function override<T extends object, K extends KeyOfType<T, Function>>(object: T, methods: K | K[], newMethod: (this: T, orig: T[K], ...args: Parameters<T[K]>) => void): void;

js/dist-typings/common/extend/Model.d.ts

@@ -1,5 +1,5 @@
 export default class Model {
-    constructor(type: any, model?: any);
+    constructor(type: any, model?: null);
     type: any;
     attributes: any[];
     hasOnes: any[];

js/dist-typings/common/helpers/avatar.d.ts

@@ -1,9 +1,12 @@
-import * as Mithril from 'mithril';
+import type Mithril from 'mithril';
+import type { ComponentAttrs } from '../Component';
 import User from '../models/User';
+export interface AvatarAttrs extends ComponentAttrs {
+}
 /**
  * The `avatar` helper displays a user's avatar.
  *
  * @param user
  * @param attrs Attributes to apply to the avatar element
  */
-export default function avatar(user: User, attrs?: Object): Mithril.Vnode;
+export default function avatar(user: User, attrs?: ComponentAttrs): Mithril.Vnode;

js/dist-typings/common/helpers/fireDebugWarning.d.ts

@@ -0,0 +1,26 @@
+/**
+ * Calls `console.warn` with the provided arguments, but only if the forum is in debug mode.
+ *
+ * This function is intended to provide warnings to extension developers about issues with
+ * their extensions that may not be easily noticed when testing, such as accessibility
+ * issues.
+ *
+ * These warnings should be hidden on production forums to ensure webmasters are not
+ * inundated with do-gooders telling them they have an issue when it isn't something they
+ * can fix.
+ */
+export default function fireDebugWarning(...args: Parameters<typeof console.warn>): void;
+/**
+ * Fire a Flarum deprecation warning which is shown in the JS console.
+ *
+ * These warnings are only shown when the forum is in debug mode, and the function exists to
+ * reduce bundle size caused by multiple warnings across our JavaScript.
+ *
+ * @param message The message to display. (Short, but sweet, please!)
+ * @param githubId The PR or Issue ID with more info in relation to this change.
+ * @param [removedFrom] The version in which this feature will be completely removed. (default: 2.0)
+ * @param [repo] The repo which the issue or PR is located in. (default: flarum/core)
+ *
+ * @see {@link fireDebugWarning}
+ */
+export declare function fireDeprecationWarning(message: string, githubId: string, removedFrom?: string, repo?: string): void;

js/dist-typings/common/helpers/fullTime.d.ts

@@ -1,4 +1,4 @@
-import * as Mithril from 'mithril';
+import type Mithril from 'mithril';
 /**
  * The `fullTime` helper displays a formatted time string wrapped in a <time>
  * tag.

js/dist-typings/common/helpers/highlight.d.ts

@@ -1,4 +1,4 @@
-import * as Mithril from 'mithril';
+import type Mithril from 'mithril';
 /**
  * The `highlight` helper searches for a word phrase in a string, and wraps
  * matches with the <mark> tag.

js/dist-typings/common/helpers/humanTime.d.ts

@@ -1,4 +1,4 @@
-import * as Mithril from 'mithril';
+import type Mithril from 'mithril';
 /**
  * The `humanTime` helper displays a time in a human-friendly time-ago format
  * (e.g. '12 days ago'), wrapped in a <time> tag with other information about

js/dist-typings/common/helpers/icon.d.ts

@@ -1,4 +1,4 @@
-import * as Mithril from 'mithril';
+import type Mithril from 'mithril';
 /**
  * The `icon` helper displays an icon.
  *

js/dist-typings/common/helpers/listItems.d.ts

@@ -1,6 +1,34 @@
-import * as Mithril from 'mithril';
+import type Mithril from 'mithril';
+import { ComponentAttrs } from '../Component';
+declare type ModdedVnodeAttrs = {
+    itemClassName?: string;
+    key?: string;
+};
+declare type ModdedTag = Mithril.Vnode['tag'] & {
+    isListItem?: boolean;
+    isActive?: (attrs: ComponentAttrs) => boolean;
+};
+declare type ModdedVnode = Mithril.Vnode<ModdedVnodeAttrs> & {
+    itemName?: string;
+    itemClassName?: string;
+    tag: ModdedTag;
+};
+declare type ModdedChild = ModdedVnode | string | number | boolean | null | undefined;
+declare type ModdedChildArray = ModdedChildren[];
+declare type ModdedChildren = ModdedChild | ModdedChildArray;
 /**
- * The `listItems` helper wraps a collection of components in <li> tags,
- * stripping out any unnecessary `Separator` components.
+ * This type represents an element of a list returned by `ItemList.toArray()`,
+ * coupled with some static properties used on various components.
  */
-export default function listItems(items: Mithril.Vnode | Array<Mithril.Vnode>): Array<Mithril.Vnode>;
+export declare type ModdedChildrenWithItemName = ModdedChildren & {
+    itemName?: string;
+};
+/**
+ * The `listItems` helper wraps an array of components in the provided tag,
+ * stripping out any unnecessary `Separator` components.
+ *
+ * By default, this tag is an `<li>` tag, but this is customisable through the
+ * second function parameter, `customTag`.
+ */
+export default function listItems<Attrs extends ComponentAttrs>(rawItems: ModdedChildrenWithItemName[], customTag?: VnodeElementTag<Attrs>, attributes?: Attrs): Mithril.Vnode[];
+export {};

js/dist-typings/common/helpers/userOnline.d.ts

@@ -1,6 +1,6 @@
-import * as Mithril from 'mithril';
+import type Mithril from 'mithril';
 import User from '../models/User';
 /**
  * The `useronline` helper displays a green circle if the user is online
  */
-export default function userOnline(user: User): Mithril.Vnode;
+export default function userOnline(user: User): Mithril.Vnode<{}, {}> | null;

js/dist-typings/common/helpers/username.d.ts

@@ -1,7 +1,7 @@
-import * as Mithril from 'mithril';
+import type Mithril from 'mithril';
 import User from '../models/User';
 /**
  * The `username` helper displays a user's username in a <span class="username">
  * tag. If the user doesn't exist, the username will be displayed as [deleted].
  */
-export default function username(user: User): Mithril.Vnode;
+export default function username(user: User | null | undefined | false): Mithril.Vnode;

js/dist-typings/common/index.d.ts

@@ -1,2 +1,3 @@
-export { Extend };
 import * as Extend from "./extend/index";
+import app from "./app";
+export { Extend, app };

js/dist-typings/common/models/Discussion.d.ts

@@ -1,3 +1,48 @@
+import Model from '../Model';
+import ItemList from '../utils/ItemList';
+import Mithril from 'mithril';
+import Post from './Post';
+import User from './User';
 export default class Discussion extends Model {
+    title(): string;
+    slug(): string;
+    createdAt(): Date | undefined;
+    user(): false | User | null;
+    firstPost(): false | Post | null;
+    lastPostedAt(): Date | null | undefined;
+    lastPostedUser(): false | User | null;
+    lastPost(): false | Post | null;
+    lastPostNumber(): number | null | undefined;
+    commentCount(): number | undefined;
+    replyCount(): Number;
+    posts(): false | (Post | undefined)[];
+    mostRelevantPost(): false | Post | null;
+    lastReadAt(): Date | null | undefined;
+    lastReadPostNumber(): number | null | undefined;
+    isUnread(): boolean;
+    isRead(): boolean;
+    hiddenAt(): Date | null | undefined;
+    hiddenUser(): false | User | null;
+    isHidden(): boolean;
+    canReply(): boolean | undefined;
+    canRename(): boolean | undefined;
+    canHide(): boolean | undefined;
+    canDelete(): boolean | undefined;
+    /**
+     * Remove a post from the discussion's posts relationship.
+     */
+    removePost(id: string): void;
+    /**
+     * Get the estimated number of unread posts in this discussion for the current
+     * user.
+     */
+    unreadCount(): number;
+    /**
+     * Get the Badge components that apply to this discussion.
+     */
+    badges(): ItemList<Mithril.Children>;
+    /**
+     * Get a list of all of the post IDs in this discussion.
+     */
+    postIds(): string[];
 }
-import Model from "../Model";

js/dist-typings/common/models/Forum.d.ts

@@ -1,3 +1,4 @@
+import Model from '../Model';
 export default class Forum extends Model {
+    apiEndpoint(): string;
 }
-import Model from "../Model";

js/dist-typings/common/models/Group.d.ts

@@ -1,9 +1,11 @@
-export default Group;
-declare class Group extends Model {
+import Model from '../Model';
+export default class Group extends Model {
+    static ADMINISTRATOR_ID: string;
+    static GUEST_ID: string;
+    static MEMBER_ID: string;
+    nameSingular(): string;
+    namePlural(): string;
+    color(): string | null;
+    icon(): string | null;
+    isHidden(): boolean;
 }
-declare namespace Group {
-    const ADMINISTRATOR_ID: string;
-    const GUEST_ID: string;
-    const MEMBER_ID: string;
-}
-import Model from "../Model";

js/dist-typings/common/models/Notification.d.ts

@@ -1,3 +1,11 @@
+import Model from '../Model';
+import User from './User';
 export default class Notification extends Model {
+    contentType(): string;
+    content(): string;
+    createdAt(): Date;
+    isRead(): boolean;
+    user(): false | User;
+    fromUser(): false | User | null;
+    subject(): false | Model | null;
 }
-import Model from "../Model";

js/dist-typings/common/models/Post.d.ts

@@ -1,3 +1,23 @@
+import Model from '../Model';
+import Discussion from './Discussion';
+import User from './User';
 export default class Post extends Model {
+    number(): number;
+    discussion(): Discussion;
+    createdAt(): Date;
+    user(): false | User;
+    contentType(): string | null;
+    content(): string | null | undefined;
+    contentHtml(): string | null | undefined;
+    renderFailed(): boolean | undefined;
+    contentPlain(): string | null | undefined;
+    editedAt(): Date | null | undefined;
+    editedUser(): false | User | null;
+    isEdited(): boolean;
+    hiddenAt(): Date | null | undefined;
+    hiddenUser(): false | User | null;
+    isHidden(): boolean;
+    canEdit(): boolean | undefined;
+    canHide(): boolean | undefined;
+    canDelete(): boolean | undefined;
 }
-import Model from "../Model";

js/dist-typings/common/models/User.d.ts

@@ -1,3 +1,46 @@
+import { Color } from 'color-thief-browser';
+import Model from '../Model';
+import ItemList from '../utils/ItemList';
+import Mithril from 'mithril';
+import Group from './Group';
 export default class User extends Model {
+    username(): string;
+    slug(): string;
+    displayName(): string;
+    email(): string | undefined;
+    isEmailConfirmed(): boolean | undefined;
+    password(): string | undefined;
+    avatarUrl(): string | null;
+    preferences(): Record<string, any> | null | undefined;
+    groups(): false | (Group | undefined)[];
+    joinTime(): Date | null | undefined;
+    lastSeenAt(): Date | null | undefined;
+    markedAllAsReadAt(): Date | null | undefined;
+    unreadNotificationCount(): number | undefined;
+    newNotificationCount(): number | undefined;
+    discussionCount(): number | undefined;
+    commentCount(): number | undefined;
+    canEdit(): boolean | undefined;
+    canEditCredentials(): boolean | undefined;
+    canEditGroups(): boolean | undefined;
+    canDelete(): boolean | undefined;
+    color(): string;
+    protected avatarColor: Color | null;
+    /**
+     * Check whether or not the user has been seen in the last 5 minutes.
+     */
+    isOnline(): boolean;
+    /**
+     * Get the Badge components that apply to this user.
+     */
+    badges(): ItemList<Mithril.Children>;
+    /**
+     * Calculate the dominant color of the user's avatar. The dominant color will
+     * be set to the `avatarColor` property once it has been calculated.
+     */
+    protected calculateAvatarColor(): void;
+    /**
+     * Update the user's preferences.
+     */
+    savePreferences(newPreferences: Record<string, unknown>): Promise<this>;
 }
-import Model from "../Model";

js/dist-typings/common/resolvers/DefaultResolver.d.ts

@@ -1,21 +1,30 @@
-import Mithril from 'mithril';
+import type Mithril from 'mithril';
+import type { RouteResolver } from '../Application';
+import type { default as Component, ComponentAttrs } from '../Component';
 /**
  * Generates a route resolver for a given component.
+ *
  * In addition to regular route resolver functionality:
  * - It provide the current route name as an attr
  * - It sets a key on the component so a rerender will be triggered on route change.
  */
-export default class DefaultResolver {
-    component: Mithril.Component;
+export default class DefaultResolver<Attrs extends ComponentAttrs, Comp extends Component<Attrs & {
     routeName: string;
-    constructor(component: any, routeName: any);
+}>, RouteArgs extends Record<string, unknown> = {}> implements RouteResolver<Attrs, Comp, RouteArgs> {
+    component: new () => Comp;
+    routeName: string;
+    constructor(component: new () => Comp, routeName: string);
     /**
      * When a route change results in a changed key, a full page
      * rerender occurs. This method can be overriden in subclasses
      * to prevent rerenders on some route changes.
      */
     makeKey(): string;
-    makeAttrs(vnode: any): any;
-    onmatch(args: any, requestedPath: any, route: any): Mithril.Component<{}, {}>;
-    render(vnode: any): any[];
+    makeAttrs(vnode: Mithril.Vnode<Attrs, Comp>): Attrs & {
+        routeName: string;
+    };
+    onmatch(args: RouteArgs, requestedPath: string, route: string): {
+        new (): Comp;
+    };
+    render(vnode: Mithril.Vnode<Attrs, Comp>): Mithril.Children;
 }