Throw exceptions in API Client responses

Currently, the API client middleware includes an error handler instance in its middleware stack, so any exceptions thrown have to be manually checked for in API client callers. This is generally forgotten or omited, and leads to issues when call sites try to read data from the response but fail with a confusing error.

In this PR, we no longer handle those errors, so they will be propogated in their original form to the original request's error handler. This is more appropriate behavior, and will make debugging errors significantly easier. This is not a breaking change, since broken requests would have failed anyway due to other, more confusing errors. Additionally, all error checking code that I've found just throws a new error if an API client request fails, so that case won't be broken either.

.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,91 @@
+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: "npm"
+          cache-dependency-path: js/package-lock.json
+
+      - name: Install JS dependencies
+        run: npm ci
+        working-directory: ./js
+
+      - name: Check JS formatting
+        run: npm run format-check
+        working-directory: ./js
+
+  build-prod:
+    name: Build and commit
+    runs-on: ubuntu-latest
+    needs: [prettier]
+
+    # 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: "npm"
+          cache-dependency-path: js/package-lock.json
+
+      # 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
+
+  build-test:
+    name: Test build
+    runs-on: ubuntu-latest
+    needs: [prettier]
+
+    # 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: "npm"
+          cache-dependency-path: js/package-lock.json
+
+      # 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
+          do_not_commit: true

.github/workflows/lint.yml

@@ -1,32 +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: Install JS dependencies
-        run: npm ci
-        working-directory: ./js
-
-      - name: Check JS formatting
-        run: npm run format-check
-        working-directory: ./js

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

@@ -1,53 +0,0 @@
-// Mithril
-import Mithril from 'mithril';
-
-// Other third-party libs
-import * as _dayjs from 'dayjs';
-import 'dayjs/plugin/relativeTime';
-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;
-  }
-
-  /**
-   * 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...`)
-   */
-  namespace JSX {
-    interface ElementAttributesProperty {
-      attrs: Record<string, unknown>;
-    }
-  }
-}
-
-/**
- * All global variables owned by flarum/core.
- */
-declare global {
-  const app: Application;
-}

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

@@ -0,0 +1,82 @@
+/**
+ * @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');
+
+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>;
+  };
+}

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

@@ -1,53 +0,0 @@
-// Mithril
-import Mithril from 'mithril';
-
-// Other third-party libs
-import * as _dayjs from 'dayjs';
-import 'dayjs/plugin/relativeTime';
-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;
-  }
-
-  /**
-   * 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...`)
-   */
-  namespace JSX {
-    interface ElementAttributesProperty {
-      attrs: Record<string, unknown>;
-    }
-  }
-}
-
-/**
- * All global variables owned by flarum/core.
- */
-declare global {
-  const app: Application;
-}

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

@@ -96,6 +96,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 +133,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;

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

@@ -1,55 +0,0 @@
-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;
-    };
-    /**
-     * 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.
-     *
-     * Alternatively, you can pass a callback that will be executed in ExtensionPage's
-     * context to include custom JSX elements.
-     *
-     * @example
-     *
-     * {
-     *    setting: 'acme.checkbox',
-     *    label: app.translator.trans('acme.admin.setting_label'),
-     *    type: 'bool',
-     *    help: app.translator.trans('acme.admin.setting_help'),
-     *    className: 'Setting-item'
-     * }
-     *
-     * @example
-     *
-     * {
-     *    setting: 'acme.select',
-     *    label: app.translator.trans('acme.admin.setting_label'),
-     *    type: 'select',
-     *    options: {
-     *      'option1': 'Option 1 label',
-     *      'option2': 'Option 2 label',
-     *    },
-     *    default: 'option1',
-     * }
-     *
-     * @param setting
-     * @returns {JSX.Element}
-     */
-    buildSettingComponent(entry: any): JSX.Element;
-    onsaved(): void;
-    setting(key: any, fallback?: string): any;
-    dirty(): {};
-    isChanged(): number;
-    saveSettings(e: any): Promise<void>;
-}
-import Page from "../../common/components/Page";

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

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

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;

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

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

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/ExtensionPage.d.ts

@@ -1,4 +1,5 @@
-export default class ExtensionPage extends AdminPage {
+export default class ExtensionPage extends AdminPage<import("../../common/components/Page").IPageAttrs> {
+    constructor();
     extension: any;
     changingState: boolean | undefined;
     infoFields: {

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;
     /**

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

@@ -1,7 +1,7 @@
 /**
  * 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.

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,4 +1,4 @@
-export default class PermissionGrid extends Component<import("../../common/Component").ComponentAttrs> {
+export default class PermissionGrid extends Component<import("../../common/Component").ComponentAttrs, undefined> {
     constructor();
     permissionItems(): ItemList;
     viewItems(): 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/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/utils/generateElementId.d.ts

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

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

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.

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/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;

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.Vnode<IButtonAttrs, never>): JSX.Element;
+    oncreate(vnode: Mithril.VnodeDOM<IButtonAttrs, 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/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/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

@@ -4,7 +4,7 @@
  *
  * @abstract
  */
-export default class Modal extends Component<import("../Component").ComponentAttrs> {
+export default class Modal extends Component<import("../Component").ComponentAttrs, undefined> {
     /**
      * Determine whether or not the modal should be dismissible via an 'x' button.
      */

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

@@ -3,7 +3,7 @@
  * 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> {
+export default class ModalManager extends Component<import("../Component").ComponentAttrs, undefined> {
     constructor();
     animateShow(readyCallback: any): void;
     animateHide(): void;

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,15 @@
+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();
-    /**
-     * A class name to apply to the body while the route is active.
-     *
-     * @type {String}
-     */
-    bodyClass: string | undefined;
-    /**
-     * Whether we should scroll to the top of the page when its rendered.
-     *
-     * @type {Boolean}
-     */
-    scrollTopOnCreate: boolean | undefined;
-    /**
-     * Whether the browser should restore scroll state on refreshes.
-     *
-     * @type {Boolean}
-     */
-    useBrowserScrollRestoration: boolean | undefined;
+export default abstract class Page<CustomAttrs extends IPageAttrs = IPageAttrs> extends Component<CustomAttrs> {
+    oninit(vnode: any): void;
+    oncreate(vnode: any): void;
+    onremove(vnode: any): 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/Select.d.ts

@@ -10,7 +10,7 @@
  *
  * 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.

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/helpers/avatar.d.ts

@@ -1,4 +1,4 @@
-import * as Mithril from 'mithril';
+import type Mithril from 'mithril';
 import User from '../models/User';
 /**
  * The `avatar` helper displays a user's avatar.

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

@@ -0,0 +1,12 @@
+/**
+ * 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;

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,4 +1,4 @@
-import * as Mithril from 'mithril';
+import type Mithril from 'mithril';
 /**
  * The `listItems` helper wraps a collection of components in <li> tags,
  * stripping out any unnecessary `Separator` components.

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

@@ -1,4 +1,4 @@
-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

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

@@ -1,4 +1,4 @@
-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">

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/resolvers/DefaultResolver.d.ts

@@ -1,4 +1,4 @@
-import Mithril from 'mithril';
+import type Mithril from 'mithril';
 /**
  * Generates a route resolver for a given component.
  * In addition to regular route resolver functionality:

js/dist-typings/common/states/AlertManagerState.d.ts

@@ -1,4 +1,4 @@
-import Mithril from 'mithril';
+import type Mithril from 'mithril';
 import Alert, { AlertAttrs } from '../components/Alert';
 /**
  * Returned by `AlertManagerState.show`. Used to dismiss alerts.

js/dist-typings/common/utils/setRouteWithForcedRefresh.d.ts

@@ -1,4 +1,4 @@
-import Mithril from 'mithril';
+import type Mithril from 'mithril';
 /**
  * Mithril 2 does not completely rerender the page if a route change leads to the same route
  * (or the same component handling a different route). This util calls m.route.set, forcing a reonit.

js/dist-typings/forum/components/AffixedSidebar.d.ts

@@ -9,7 +9,7 @@
  *
  * @see https://getbootstrap.com/docs/3.4/javascript/#affix
  */
-export default class AffixedSidebar extends Component<import("../../common/Component").ComponentAttrs> {
+export default class AffixedSidebar extends Component<import("../../common/Component").ComponentAttrs, undefined> {
     constructor();
     boundOnresize: (() => void) | undefined;
     onresize(): void;

js/dist-typings/forum/components/AvatarEditor.d.ts

@@ -7,7 +7,7 @@
  * - `className`
  * - `user`
  */
-export default class AvatarEditor extends Component<import("../../common/Component").ComponentAttrs> {
+export default class AvatarEditor extends Component<import("../../common/Component").ComponentAttrs, undefined> {
     constructor();
     /**
      * Whether or not an avatar upload is in progress.

js/dist-typings/forum/components/CommentPost.d.ts

@@ -24,7 +24,7 @@ export default class CommentPost extends Post {
     cardVisible: boolean | undefined;
     refreshContent(): void;
     contentHtml: any;
-    isEditing(): any;
+    isEditing(): boolean;
     /**
      * Toggle the visibility of a hidden post's content.
      */

js/dist-typings/forum/components/Composer.d.ts

@@ -3,14 +3,8 @@
  * content component with `load` and then its position/state can be altered with
  * `show`, `hide`, `close`, `minimize`, `fullScreen`, and `exitFullScreen`.
  */
-export default class Composer extends Component<import("../../common/Component").ComponentAttrs> {
+export default class Composer extends Component<import("../../common/Component").ComponentAttrs, undefined> {
     constructor();
-    /**
-     * The composer's "state".
-     *
-     * @type {ComposerState}
-     */
-    state: ComposerState | undefined;
     /**
      * Whether or not the composer currently has focus.
      *
@@ -108,5 +102,4 @@ export default class Composer extends Component<import("../../common/Component")
     changeHeight(height: any): void;
 }
 import Component from "../../common/Component";
-import ComposerState from "../states/ComposerState";
 import ItemList from "../../common/utils/ItemList";

js/dist-typings/forum/components/ComposerBody.d.ts

@@ -15,7 +15,7 @@
  *
  * @abstract
  */
-export default class ComposerBody extends Component<import("../../common/Component").ComponentAttrs> {
+export default class ComposerBody extends Component<import("../../common/Component").ComponentAttrs, undefined> {
     constructor();
     composer: any;
     /**

js/dist-typings/forum/components/ComposerButton.d.ts

@@ -2,7 +2,8 @@
  * The `ComposerButton` component displays a button suitable for the composer
  * controls.
  */
-export default class ComposerButton extends Button {
+export default class ComposerButton extends Button<import("../../common/components/Button").IButtonAttrs> {
     static initAttrs(attrs: any): void;
+    constructor();
 }
 import Button from "../../common/components/Button";

js/dist-typings/forum/components/ComposerPostPreview.d.ts

@@ -10,7 +10,7 @@
  * - `className` A CSS class for the element surrounding the preview.
  * - `surround` A callback that can execute code before and after re-render, e.g. for scroll anchoring.
  */
-export default class ComposerPostPreview extends Component<import("../../common/Component").ComponentAttrs> {
+export default class ComposerPostPreview extends Component<import("../../common/Component").ComponentAttrs, undefined> {
     static initAttrs(attrs: any): void;
     constructor();
     updateInterval: number | undefined;

js/dist-typings/forum/components/DiscussionHero.d.ts

@@ -5,7 +5,7 @@
  *
  * - `discussion`
  */
-export default class DiscussionHero extends Component<import("../../common/Component").ComponentAttrs> {
+export default class DiscussionHero extends Component<import("../../common/Component").ComponentAttrs, undefined> {
     constructor();
     /**
      * Build an item list for the contents of the discussion hero.

js/dist-typings/forum/components/DiscussionList.d.ts

@@ -5,7 +5,7 @@
  *
  * - `state` A DiscussionListState object that represents the discussion lists's state.
  */
-export default class DiscussionList extends Component<import("../../common/Component").ComponentAttrs> {
+export default class DiscussionList extends Component<import("../../common/Component").ComponentAttrs, undefined> {
     constructor();
 }
 import Component from "../../common/Component";

js/dist-typings/forum/components/DiscussionListItem.d.ts

@@ -7,7 +7,7 @@
  * - `discussion`
  * - `params`
  */
-export default class DiscussionListItem extends Component<import("../../common/Component").ComponentAttrs> {
+export default class DiscussionListItem extends Component<import("../../common/Component").ComponentAttrs, undefined> {
     constructor();
     /**
      * Set up a subtree retainer so that the discussion will not be redrawn

js/dist-typings/forum/components/DiscussionListPane.d.ts

@@ -7,7 +7,7 @@
  *
  * - `state` A DiscussionListState object that represents the discussion lists's state.
  */
-export default class DiscussionListPane extends Component<import("../../common/Component").ComponentAttrs> {
+export default class DiscussionListPane extends Component<import("../../common/Component").ComponentAttrs, undefined> {
     constructor();
     /**
      * Are we on a device that's larger than we consider "mobile"?

js/dist-typings/forum/components/DiscussionPage.d.ts

@@ -2,7 +2,9 @@
  * The `DiscussionPage` component displays a whole discussion page, including
  * the discussion list pane, the hero, the posts, and the sidebar.
  */
-export default class DiscussionPage extends Page {
+export default class DiscussionPage extends Page<import("../../common/components/Page").IPageAttrs> {
+    constructor();
+    useBrowserScrollRestoration: boolean | undefined;
     /**
      * The discussion that is being viewed.
      *
@@ -15,6 +17,37 @@ export default class DiscussionPage extends Page {
      * @type {number}
      */
     near: number | undefined;
+    bodyClass: string | undefined;
+    /**
+     * List of components shown while the discussion is loading.
+     *
+     * @returns {ItemList}
+     */
+    loadingItems(): ItemList;
+    /**
+     * Function that renders the `sidebarItems` ItemList.
+     *
+     * @returns {import('mithril').Children}
+     */
+    sidebar(): import('mithril').Children;
+    /**
+     * Renders the discussion's hero.
+     *
+     * @returns {import('mithril').Children}
+     */
+    hero(): import('mithril').Children;
+    /**
+     * List of items rendered as the main page content.
+     *
+     * @returns {ItemList}
+     */
+    pageContent(): ItemList;
+    /**
+     * List of items rendered inside the main page content container.
+     *
+     * @returns {ItemList}
+     */
+    mainContent(): ItemList;
     /**
      * Load the discussion from the API or use the preloaded one.
      */
@@ -49,5 +82,5 @@ export default class DiscussionPage extends Page {
     positionChanged(startNumber: any, endNumber: any): void;
 }
 import Page from "../../common/components/Page";
-import PostStreamState from "../states/PostStreamState";
 import ItemList from "../../common/utils/ItemList";
+import PostStreamState from "../states/PostStreamState";

js/dist-typings/forum/components/DiscussionsSearchSource.d.ts

@@ -1,5 +1,5 @@
 import { SearchSource } from './Search';
-import Mithril from 'mithril';
+import type Mithril from 'mithril';
 /**
  * The `DiscussionsSearchSource` finds and displays discussion search results in
  * the search dropdown.

js/dist-typings/forum/components/DiscussionsUserPage.d.ts

@@ -3,7 +3,5 @@
  * page.
  */
 export default class DiscussionsUserPage extends UserPage {
-    state: DiscussionListState | undefined;
 }
 import UserPage from "./UserPage";
-import DiscussionListState from "../states/DiscussionListState";

js/dist-typings/forum/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();
     /**
      * Build an item list for the controls.

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

@@ -3,7 +3,7 @@
  * the search box and the user menu. On the default skin, these are shown on the
  * right side of the header.
  */
-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.

js/dist-typings/forum/components/IndexPage.d.ts

@@ -2,9 +2,12 @@
  * The `IndexPage` component displays the index page, including the welcome
  * hero, the sidebar, and the discussion list.
  */
-export default class IndexPage extends Page {
+export default class IndexPage extends Page<import("../../common/components/Page").IPageAttrs> {
     static providesInitialSearch: boolean;
+    constructor();
     lastDiscussion: any;
+    bodyClass: string | undefined;
+    scrollTopOnCreate: boolean | undefined;
     setTitle(): void;
     /**
      * Get the component to display as the hero.

js/dist-typings/forum/components/LoadingPost.d.ts

@@ -2,7 +2,7 @@
  * The `LoadingPost` component shows a placeholder that looks like a post,
  * indicating that the post is loading.
  */
-export default class LoadingPost extends Component<import("../../common/Component").ComponentAttrs> {
+export default class LoadingPost extends Component<import("../../common/Component").ComponentAttrs, undefined> {
     constructor();
 }
 import Component from "../../common/Component";

js/dist-typings/forum/components/LogInButton.d.ts

@@ -6,7 +6,8 @@
  *
  * - `path`
  */
-export default class LogInButton extends Button {
+export default class LogInButton extends Button<import("../../common/components/Button").IButtonAttrs> {
     static initAttrs(attrs: any): void;
+    constructor();
 }
 import Button from "../../common/components/Button";

js/dist-typings/forum/components/LogInButtons.d.ts

@@ -1,7 +1,7 @@
 /**
  * The `LogInButtons` component displays a collection of social login buttons.
  */
-export default class LogInButtons extends Component<import("../../common/Component").ComponentAttrs> {
+export default class LogInButtons extends Component<import("../../common/Component").ComponentAttrs, undefined> {
     constructor();
     /**
      * Build a list of LogInButton components.

js/dist-typings/forum/components/Notification.d.ts

@@ -8,7 +8,7 @@
  *
  * @abstract
  */
-export default class Notification extends Component<import("../../common/Component").ComponentAttrs> {
+export default class Notification extends Component<import("../../common/Component").ComponentAttrs, undefined> {
     constructor();
     /**
      * Get the name of the icon that should be displayed in the notification.

js/dist-typings/forum/components/NotificationGrid.d.ts

@@ -6,7 +6,7 @@
  *
  * - `user`
  */
-export default class NotificationGrid extends Component<import("../../common/Component").ComponentAttrs> {
+export default class NotificationGrid extends Component<import("../../common/Component").ComponentAttrs, undefined> {
     constructor();
     /**
      * Information about the available notification methods.

js/dist-typings/forum/components/NotificationList.d.ts

@@ -2,7 +2,7 @@
  * The `NotificationList` component displays a list of the logged-in user's
  * notifications, grouped by discussion.
  */
-export default class NotificationList extends Component<import("../../common/Component").ComponentAttrs> {
+export default class NotificationList extends Component<import("../../common/Component").ComponentAttrs, undefined> {
     constructor();
     content(state: any): any;
     $notifications: JQuery<HTMLElement> | undefined;

js/dist-typings/forum/components/NotificationsPage.d.ts

@@ -2,6 +2,8 @@
  * The `NotificationsPage` component shows the notifications list. It is only
  * used on mobile devices where the notifications dropdown is within the drawer.
  */
-export default class NotificationsPage extends Page {
+export default class NotificationsPage extends Page<import("../../common/components/Page").IPageAttrs> {
+    constructor();
+    bodyClass: string | undefined;
 }
 import Page from "../../common/components/Page";

js/dist-typings/forum/components/Post.d.ts

@@ -9,7 +9,7 @@
  *
  * @abstract
  */
-export default class Post extends Component<import("../../common/Component").ComponentAttrs> {
+export default class Post extends Component<import("../../common/Component").ComponentAttrs, undefined> {
     constructor();
     loading: boolean | undefined;
     /**

js/dist-typings/forum/components/PostEdited.d.ts

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

js/dist-typings/forum/components/PostMeta.d.ts

@@ -7,7 +7,7 @@
  *
  * - `post`
  */
-export default class PostMeta extends Component<import("../../common/Component").ComponentAttrs> {
+export default class PostMeta extends Component<import("../../common/Component").ComponentAttrs, undefined> {
     constructor();
     /**
      * Get the permalink for the given post.

js/dist-typings/forum/components/PostPreview.d.ts

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

js/dist-typings/forum/components/PostStream.d.ts

@@ -9,7 +9,7 @@
  * - `targetPost`
  * - `onPositionChange`
  */
-export default class PostStream extends Component<import("../../common/Component").ComponentAttrs> {
+export default class PostStream extends Component<import("../../common/Component").ComponentAttrs, undefined> {
     constructor();
     discussion: any;
     stream: any;

js/dist-typings/forum/components/PostStreamScrubber.d.ts

@@ -7,7 +7,7 @@
  * - `stream`
  * - `className`
  */
-export default class PostStreamScrubber extends Component<import("../../common/Component").ComponentAttrs> {
+export default class PostStreamScrubber extends Component<import("../../common/Component").ComponentAttrs, undefined> {
     constructor();
     stream: any;
     handlers: {} | undefined;

js/dist-typings/forum/components/PostUser.d.ts

@@ -5,7 +5,7 @@
  *
  * - `post`
  */
-export default class PostUser extends Component<import("../../common/Component").ComponentAttrs> {
+export default class PostUser extends Component<import("../../common/Component").ComponentAttrs, undefined> {
     constructor();
     /**
      * Show the user card.

js/dist-typings/forum/components/ReplyPlaceholder.d.ts

@@ -6,7 +6,7 @@
  *
  * - `discussion`
  */
-export default class ReplyPlaceholder extends Component<import("../../common/Component").ComponentAttrs> {
+export default class ReplyPlaceholder extends Component<import("../../common/Component").ComponentAttrs, undefined> {
     constructor();
     anchorPreview(preview: any): void;
 }

js/dist-typings/forum/components/Search.d.ts

@@ -2,7 +2,7 @@ import Component, { ComponentAttrs } from '../../common/Component';
 import ItemList from '../../common/utils/ItemList';
 import KeyboardNavigatable from '../utils/KeyboardNavigatable';
 import SearchState from '../states/SearchState';
-import Mithril from 'mithril';
+import type Mithril from 'mithril';
 /**
  * The `SearchSource` interface defines a section of search results in the
  * search dropdown.

js/dist-typings/forum/components/TerminalPost.d.ts

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

js/dist-typings/forum/components/UserCard.d.ts

@@ -10,7 +10,7 @@
  * - `editable`
  * - `controlsButtonClassName`
  */
-export default class UserCard extends Component<import("../../common/Component").ComponentAttrs> {
+export default class UserCard extends Component<import("../../common/Component").ComponentAttrs, undefined> {
     constructor();
     /**
      * Build an item list of tidbits of info to show on this user's profile.

js/dist-typings/forum/components/UserPage.d.ts

@@ -5,13 +5,15 @@
  *
  * @abstract
  */
-export default class UserPage extends Page {
+export default class UserPage extends Page<import("../../common/components/Page").IPageAttrs> {
+    constructor();
     /**
      * The user this page is for.
      *
      * @type {User}
      */
     user: any;
+    bodyClass: string | undefined;
     /**
      * Get the content to display in the user page.
      *

js/dist-typings/forum/components/UsersSearchSource.d.ts

@@ -1,5 +1,5 @@
 import { SearchSource } from './Search';
-import Mithril from 'mithril';
+import type Mithril from 'mithril';
 /**
  * The `UsersSearchSource` finds and displays user search results in the search
  * dropdown.

js/dist-typings/forum/components/WelcomeHero.d.ts

@@ -2,7 +2,7 @@
  * The `WelcomeHero` component displays a hero that welcomes the user to the
  * forum.
  */
-export default class WelcomeHero extends Component<import("../../common/Component").ComponentAttrs> {
+export default class WelcomeHero extends Component<import("../../common/Component").ComponentAttrs, undefined> {
     constructor();
     hidden: string | boolean | null | undefined;
     /**

js/package-lock.json

@@ -16,6 +16,7 @@
         "jquery": "^3.6.0",
         "jquery.hotkeys": "^0.1.0",
         "mithril": "^2.0.4",
+        "nanoid": "^3.1.25",
         "punycode": "^2.1.1",
         "textarea-caret": "^3.1.0",
         "throttle-debounce": "^3.0.1"
@@ -31,7 +32,6 @@
         "cross-env": "^7.0.3",
         "flarum-tsconfig": "^0.1.0-beta.16",
         "flarum-webpack-config": "0.1.0-beta.16.2",
-        "husky": "^4.3.8",
         "prettier": "^2.3.0",
         "typescript": "^4.2.4",
         "webpack": "^4.46.0",
@@ -1516,12 +1516,6 @@
       "integrity": "sha512-f5j5b/Gf71L+dbqxIpQ4Z2WlmI/mPJ0fOkGGmFgtb6sAu97EPczzbS3/tJKxmcYDj55OX6ssqwDAWOHIYDRDGA==",
       "dev": true
     },
-    "node_modules/@types/parse-json": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/@types/parse-json/-/parse-json-4.0.0.tgz",
-      "integrity": "sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA==",
-      "dev": true
-    },
     "node_modules/@types/punycode": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/@types/punycode/-/punycode-2.1.0.tgz",
@@ -2494,15 +2488,6 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/callsites": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
-      "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=6"
-      }
-    },
     "node_modules/camelcase": {
       "version": "5.3.1",
       "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
@@ -2617,12 +2602,6 @@
       "integrity": "sha512-ucF9caQEX5wQlY449KZBIJPx91+kRg9tJ3tWSc4+KzrvC5KNiPm/3g1noP8VhdI3046+Vw3jLmKAD0fjCRJTmw==",
       "dev": true
     },
-    "node_modules/ci-info": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-2.0.0.tgz",
-      "integrity": "sha512-5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ==",
-      "dev": true
-    },
     "node_modules/cipher-base": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.4.tgz",
@@ -2793,12 +2772,6 @@
       "resolved": "https://registry.npmjs.org/commondir/-/commondir-1.0.1.tgz",
       "integrity": "sha1-3dgA2gxmEnOTzKWVDqloo6rxJTs="
     },
-    "node_modules/compare-versions": {
-      "version": "3.6.0",
-      "resolved": "https://registry.npmjs.org/compare-versions/-/compare-versions-3.6.0.tgz",
-      "integrity": "sha512-W6Af2Iw1z4CB7q4uU4hv646dW9GQuBM+YpC0UvUCWSD8w90SJjp+ujJuXaEMtAXBtSqGfMPuFOVn4/+FlaqfBA==",
-      "dev": true
-    },
     "node_modules/component-emitter": {
       "version": "1.3.0",
       "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.3.0.tgz",
@@ -2891,22 +2864,6 @@
       "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
       "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac="
     },
-    "node_modules/cosmiconfig": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-7.0.0.tgz",
-      "integrity": "sha512-pondGvTuVYDk++upghXJabWzL6Kxu6f26ljFw64Swq9v6sQPUL3EUlVDV56diOjpCayKihL6hVe8exIACU4XcA==",
-      "dev": true,
-      "dependencies": {
-        "@types/parse-json": "^4.0.0",
-        "import-fresh": "^3.2.1",
-        "parse-json": "^5.0.0",
-        "path-type": "^4.0.0",
-        "yaml": "^1.10.0"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
     "node_modules/create-ecdh": {
       "version": "4.0.4",
       "resolved": "https://registry.npmjs.org/create-ecdh/-/create-ecdh-4.0.4.tgz",
@@ -3601,21 +3558,6 @@
         "node": ">=8"
       }
     },
-    "node_modules/find-versions": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/find-versions/-/find-versions-4.0.0.tgz",
-      "integrity": "sha512-wgpWy002tA+wgmO27buH/9KzyEOQnKsG/R0yrcjPT9BOFm0zRBVQbZ95nRGXWMywS8YR5knRbpohio0bcJABxQ==",
-      "dev": true,
-      "dependencies": {
-        "semver-regex": "^3.1.2"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
     "node_modules/findup-sync": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/findup-sync/-/findup-sync-3.0.0.tgz",
@@ -4045,179 +3987,6 @@
       "resolved": "https://registry.npmjs.org/https-browserify/-/https-browserify-1.0.0.tgz",
       "integrity": "sha1-7AbBDgo0wPL68Zn3/X/Hj//QPHM="
     },
-    "node_modules/husky": {
-      "version": "4.3.8",
-      "resolved": "https://registry.npmjs.org/husky/-/husky-4.3.8.tgz",
-      "integrity": "sha512-LCqqsB0PzJQ/AlCgfrfzRe3e3+NvmefAdKQhRYpxS4u6clblBoDdzzvHi8fmxKRzvMxPY/1WZWzomPZww0Anow==",
-      "dev": true,
-      "hasInstallScript": true,
-      "dependencies": {
-        "chalk": "^4.0.0",
-        "ci-info": "^2.0.0",
-        "compare-versions": "^3.6.0",
-        "cosmiconfig": "^7.0.0",
-        "find-versions": "^4.0.0",
-        "opencollective-postinstall": "^2.0.2",
-        "pkg-dir": "^5.0.0",
-        "please-upgrade-node": "^3.2.0",
-        "slash": "^3.0.0",
-        "which-pm-runs": "^1.0.0"
-      },
-      "bin": {
-        "husky-run": "bin/run.js",
-        "husky-upgrade": "lib/upgrader/bin.js"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/husky"
-      }
-    },
-    "node_modules/husky/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dev": true,
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/husky/node_modules/chalk": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.1.tgz",
-      "integrity": "sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
-    "node_modules/husky/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dev": true,
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/husky/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-      "dev": true
-    },
-    "node_modules/husky/node_modules/find-up": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz",
-      "integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==",
-      "dev": true,
-      "dependencies": {
-        "locate-path": "^6.0.0",
-        "path-exists": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/husky/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/husky/node_modules/locate-path": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz",
-      "integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==",
-      "dev": true,
-      "dependencies": {
-        "p-locate": "^5.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/husky/node_modules/p-limit": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz",
-      "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==",
-      "dev": true,
-      "dependencies": {
-        "yocto-queue": "^0.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/husky/node_modules/p-locate": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz",
-      "integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==",
-      "dev": true,
-      "dependencies": {
-        "p-limit": "^3.0.2"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/husky/node_modules/pkg-dir": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-5.0.0.tgz",
-      "integrity": "sha512-NPE8TDbzl/3YQYY7CSS228s3g2ollTFnc+Qi3tqmqJp9Vg2ovUpixcJEo2HJScN2Ez+kEaal6y70c0ehqJBJeA==",
-      "dev": true,
-      "dependencies": {
-        "find-up": "^5.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/husky/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/ieee754": {
       "version": "1.2.1",
       "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz",
@@ -4242,22 +4011,6 @@
       "resolved": "https://registry.npmjs.org/iferr/-/iferr-0.1.5.tgz",
       "integrity": "sha1-xg7taebY/bazEEofy8ocGS3FtQE="
     },
-    "node_modules/import-fresh": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz",
-      "integrity": "sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==",
-      "dev": true,
-      "dependencies": {
-        "parent-module": "^1.0.0",
-        "resolve-from": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
     "node_modules/import-local": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/import-local/-/import-local-2.0.0.tgz",
@@ -4897,6 +4650,17 @@
       "integrity": "sha512-M2ufzIiINKCuDfBSAUr1vWQ+vuVcA9kqx8JJUsbQi6yf1uGRyb7HfpdfUr5qLXf3B/t8dPvcjhKMmlfnP47EzQ==",
       "optional": true
     },
+    "node_modules/nanoid": {
+      "version": "3.1.25",
+      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.1.25.tgz",
+      "integrity": "sha512-rdwtIXaXCLFAQbnfqDRnI6jaRHp9fTcYBjtFKE8eezcZ7LuLjhUaQGNeMXf1HmRoCH32CLz6XwX0TtxEOS/A3Q==",
+      "bin": {
+        "nanoid": "bin/nanoid.cjs"
+      },
+      "engines": {
+        "node": "^10 || ^12 || ^13.7 || ^14 || >=15.0.1"
+      }
+    },
     "node_modules/nanomatch": {
       "version": "1.2.13",
       "resolved": "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.13.tgz",
@@ -5143,15 +4907,6 @@
         "wrappy": "1"
       }
     },
-    "node_modules/opencollective-postinstall": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/opencollective-postinstall/-/opencollective-postinstall-2.0.3.tgz",
-      "integrity": "sha512-8AV/sCtuzUeTo8gQK5qDZzARrulB3egtLzFgteqB2tcT4Mw7B8Kt7JcDHmltjz6FOAHsvTevk70gZEbhM4ZS9Q==",
-      "dev": true,
-      "bin": {
-        "opencollective-postinstall": "index.js"
-      }
-    },
     "node_modules/opener": {
       "version": "1.5.2",
       "resolved": "https://registry.npmjs.org/opener/-/opener-1.5.2.tgz",
@@ -5215,18 +4970,6 @@
         "readable-stream": "^2.1.5"
       }
     },
-    "node_modules/parent-module": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz",
-      "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==",
-      "dev": true,
-      "dependencies": {
-        "callsites": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
     "node_modules/parse-asn1": {
       "version": "5.1.6",
       "resolved": "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.6.tgz",
@@ -5317,15 +5060,6 @@
       "integrity": "sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw==",
       "dev": true
     },
-    "node_modules/path-type": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz",
-      "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/pbkdf2": {
       "version": "3.1.2",
       "resolved": "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.1.2.tgz",
@@ -5373,15 +5107,6 @@
         "node": ">=8"
       }
     },
-    "node_modules/please-upgrade-node": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/please-upgrade-node/-/please-upgrade-node-3.2.0.tgz",
-      "integrity": "sha512-gQR3WpIgNIKwBMVLkpMUeR3e1/E1y42bqDQZfql+kDeXd8COYfM8PQA4X6y7a8u9Ua9FHmsrrmirW2vHs45hWg==",
-      "dev": true,
-      "dependencies": {
-        "semver-compare": "^1.0.0"
-      }
-    },
     "node_modules/posix-character-classes": {
       "version": "0.1.1",
       "resolved": "https://registry.npmjs.org/posix-character-classes/-/posix-character-classes-0.1.1.tgz",
@@ -5801,15 +5526,6 @@
         "which": "bin/which"
       }
     },
-    "node_modules/resolve-from": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz",
-      "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
     "node_modules/resolve-url": {
       "version": "0.2.1",
       "resolved": "https://registry.npmjs.org/resolve-url/-/resolve-url-0.2.1.tgz",
@@ -5896,24 +5612,6 @@
         "semver": "bin/semver.js"
       }
     },
-    "node_modules/semver-compare": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/semver-compare/-/semver-compare-1.0.0.tgz",
-      "integrity": "sha1-De4hahyUGrN+nvsXiPavxf9VN/w=",
-      "dev": true
-    },
-    "node_modules/semver-regex": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/semver-regex/-/semver-regex-3.1.2.tgz",
-      "integrity": "sha512-bXWyL6EAKOJa81XG1OZ/Yyuq+oT0b2YLlxx7c+mrdYPaPbnj6WgVULXhinMIeZGufuUBu/eVRqXEhiv4imfwxA==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
     "node_modules/serialize-javascript": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-4.0.0.tgz",
@@ -6013,15 +5711,6 @@
         "node": ">= 10"
       }
     },
-    "node_modules/slash": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
-      "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/snapdragon": {
       "version": "0.8.2",
       "resolved": "https://registry.npmjs.org/snapdragon/-/snapdragon-0.8.2.tgz",
@@ -7525,12 +7214,6 @@
       "integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=",
       "dev": true
     },
-    "node_modules/which-pm-runs": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/which-pm-runs/-/which-pm-runs-1.0.0.tgz",
-      "integrity": "sha1-Zws6+8VS4LVd9rd4DKdGFfI60cs=",
-      "dev": true
-    },
     "node_modules/worker-farm": {
       "version": "1.7.0",
       "resolved": "https://registry.npmjs.org/worker-farm/-/worker-farm-1.7.0.tgz",
@@ -7597,15 +7280,6 @@
       "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz",
       "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g=="
     },
-    "node_modules/yaml": {
-      "version": "1.10.2",
-      "resolved": "https://registry.npmjs.org/yaml/-/yaml-1.10.2.tgz",
-      "integrity": "sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==",
-      "dev": true,
-      "engines": {
-        "node": ">= 6"
-      }
-    },
     "node_modules/yargs": {
       "version": "13.3.2",
       "resolved": "https://registry.npmjs.org/yargs/-/yargs-13.3.2.tgz",
@@ -7679,18 +7353,6 @@
       "engines": {
         "node": ">=4"
       }
-    },
-    "node_modules/yocto-queue": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz",
-      "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==",
-      "dev": true,
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
     }
   },
   "dependencies": {
@@ -8915,12 +8577,6 @@
       "integrity": "sha512-f5j5b/Gf71L+dbqxIpQ4Z2WlmI/mPJ0fOkGGmFgtb6sAu97EPczzbS3/tJKxmcYDj55OX6ssqwDAWOHIYDRDGA==",
       "dev": true
     },
-    "@types/parse-json": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/@types/parse-json/-/parse-json-4.0.0.tgz",
-      "integrity": "sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA==",
-      "dev": true
-    },
     "@types/punycode": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/@types/punycode/-/punycode-2.1.0.tgz",
@@ -9721,12 +9377,6 @@
         "get-intrinsic": "^1.0.2"
       }
     },
-    "callsites": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
-      "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==",
-      "dev": true
-    },
     "camelcase": {
       "version": "5.3.1",
       "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
@@ -9817,12 +9467,6 @@
       "integrity": "sha512-ucF9caQEX5wQlY449KZBIJPx91+kRg9tJ3tWSc4+KzrvC5KNiPm/3g1noP8VhdI3046+Vw3jLmKAD0fjCRJTmw==",
       "dev": true
     },
-    "ci-info": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-2.0.0.tgz",
-      "integrity": "sha512-5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ==",
-      "dev": true
-    },
     "cipher-base": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.4.tgz",
@@ -9966,12 +9610,6 @@
       "resolved": "https://registry.npmjs.org/commondir/-/commondir-1.0.1.tgz",
       "integrity": "sha1-3dgA2gxmEnOTzKWVDqloo6rxJTs="
     },
-    "compare-versions": {
-      "version": "3.6.0",
-      "resolved": "https://registry.npmjs.org/compare-versions/-/compare-versions-3.6.0.tgz",
-      "integrity": "sha512-W6Af2Iw1z4CB7q4uU4hv646dW9GQuBM+YpC0UvUCWSD8w90SJjp+ujJuXaEMtAXBtSqGfMPuFOVn4/+FlaqfBA==",
-      "dev": true
-    },
     "component-emitter": {
       "version": "1.3.0",
       "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.3.0.tgz",
@@ -10053,19 +9691,6 @@
       "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
       "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac="
     },
-    "cosmiconfig": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-7.0.0.tgz",
-      "integrity": "sha512-pondGvTuVYDk++upghXJabWzL6Kxu6f26ljFw64Swq9v6sQPUL3EUlVDV56diOjpCayKihL6hVe8exIACU4XcA==",
-      "dev": true,
-      "requires": {
-        "@types/parse-json": "^4.0.0",
-        "import-fresh": "^3.2.1",
-        "parse-json": "^5.0.0",
-        "path-type": "^4.0.0",
-        "yaml": "^1.10.0"
-      }
-    },
     "create-ecdh": {
       "version": "4.0.4",
       "resolved": "https://registry.npmjs.org/create-ecdh/-/create-ecdh-4.0.4.tgz",
@@ -10626,15 +10251,6 @@
         "path-exists": "^4.0.0"
       }
     },
-    "find-versions": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/find-versions/-/find-versions-4.0.0.tgz",
-      "integrity": "sha512-wgpWy002tA+wgmO27buH/9KzyEOQnKsG/R0yrcjPT9BOFm0zRBVQbZ95nRGXWMywS8YR5knRbpohio0bcJABxQ==",
-      "dev": true,
-      "requires": {
-        "semver-regex": "^3.1.2"
-      }
-    },
     "findup-sync": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/findup-sync/-/findup-sync-3.0.0.tgz",
@@ -10957,121 +10573,6 @@
       "resolved": "https://registry.npmjs.org/https-browserify/-/https-browserify-1.0.0.tgz",
       "integrity": "sha1-7AbBDgo0wPL68Zn3/X/Hj//QPHM="
     },
-    "husky": {
-      "version": "4.3.8",
-      "resolved": "https://registry.npmjs.org/husky/-/husky-4.3.8.tgz",
-      "integrity": "sha512-LCqqsB0PzJQ/AlCgfrfzRe3e3+NvmefAdKQhRYpxS4u6clblBoDdzzvHi8fmxKRzvMxPY/1WZWzomPZww0Anow==",
-      "dev": true,
-      "requires": {
-        "chalk": "^4.0.0",
-        "ci-info": "^2.0.0",
-        "compare-versions": "^3.6.0",
-        "cosmiconfig": "^7.0.0",
-        "find-versions": "^4.0.0",
-        "opencollective-postinstall": "^2.0.2",
-        "pkg-dir": "^5.0.0",
-        "please-upgrade-node": "^3.2.0",
-        "slash": "^3.0.0",
-        "which-pm-runs": "^1.0.0"
-      },
-      "dependencies": {
-        "ansi-styles": {
-          "version": "4.3.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-          "dev": true,
-          "requires": {
-            "color-convert": "^2.0.1"
-          }
-        },
-        "chalk": {
-          "version": "4.1.1",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.1.tgz",
-          "integrity": "sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^4.1.0",
-            "supports-color": "^7.1.0"
-          }
-        },
-        "color-convert": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-          "dev": true,
-          "requires": {
-            "color-name": "~1.1.4"
-          }
-        },
-        "color-name": {
-          "version": "1.1.4",
-          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-          "dev": true
-        },
-        "find-up": {
-          "version": "5.0.0",
-          "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz",
-          "integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==",
-          "dev": true,
-          "requires": {
-            "locate-path": "^6.0.0",
-            "path-exists": "^4.0.0"
-          }
-        },
-        "has-flag": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-          "dev": true
-        },
-        "locate-path": {
-          "version": "6.0.0",
-          "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz",
-          "integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==",
-          "dev": true,
-          "requires": {
-            "p-locate": "^5.0.0"
-          }
-        },
-        "p-limit": {
-          "version": "3.1.0",
-          "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz",
-          "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==",
-          "dev": true,
-          "requires": {
-            "yocto-queue": "^0.1.0"
-          }
-        },
-        "p-locate": {
-          "version": "5.0.0",
-          "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz",
-          "integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==",
-          "dev": true,
-          "requires": {
-            "p-limit": "^3.0.2"
-          }
-        },
-        "pkg-dir": {
-          "version": "5.0.0",
-          "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-5.0.0.tgz",
-          "integrity": "sha512-NPE8TDbzl/3YQYY7CSS228s3g2ollTFnc+Qi3tqmqJp9Vg2ovUpixcJEo2HJScN2Ez+kEaal6y70c0ehqJBJeA==",
-          "dev": true,
-          "requires": {
-            "find-up": "^5.0.0"
-          }
-        },
-        "supports-color": {
-          "version": "7.2.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-          "dev": true,
-          "requires": {
-            "has-flag": "^4.0.0"
-          }
-        }
-      }
-    },
     "ieee754": {
       "version": "1.2.1",
       "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz",
@@ -11082,16 +10583,6 @@
       "resolved": "https://registry.npmjs.org/iferr/-/iferr-0.1.5.tgz",
       "integrity": "sha1-xg7taebY/bazEEofy8ocGS3FtQE="
     },
-    "import-fresh": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz",
-      "integrity": "sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==",
-      "dev": true,
-      "requires": {
-        "parent-module": "^1.0.0",
-        "resolve-from": "^4.0.0"
-      }
-    },
     "import-local": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/import-local/-/import-local-2.0.0.tgz",
@@ -11602,6 +11093,11 @@
       "integrity": "sha512-M2ufzIiINKCuDfBSAUr1vWQ+vuVcA9kqx8JJUsbQi6yf1uGRyb7HfpdfUr5qLXf3B/t8dPvcjhKMmlfnP47EzQ==",
       "optional": true
     },
+    "nanoid": {
+      "version": "3.1.25",
+      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.1.25.tgz",
+      "integrity": "sha512-rdwtIXaXCLFAQbnfqDRnI6jaRHp9fTcYBjtFKE8eezcZ7LuLjhUaQGNeMXf1HmRoCH32CLz6XwX0TtxEOS/A3Q=="
+    },
     "nanomatch": {
       "version": "1.2.13",
       "resolved": "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.13.tgz",
@@ -11808,12 +11304,6 @@
         "wrappy": "1"
       }
     },
-    "opencollective-postinstall": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/opencollective-postinstall/-/opencollective-postinstall-2.0.3.tgz",
-      "integrity": "sha512-8AV/sCtuzUeTo8gQK5qDZzARrulB3egtLzFgteqB2tcT4Mw7B8Kt7JcDHmltjz6FOAHsvTevk70gZEbhM4ZS9Q==",
-      "dev": true
-    },
     "opener": {
       "version": "1.5.2",
       "resolved": "https://registry.npmjs.org/opener/-/opener-1.5.2.tgz",
@@ -11862,15 +11352,6 @@
         "readable-stream": "^2.1.5"
       }
     },
-    "parent-module": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz",
-      "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==",
-      "dev": true,
-      "requires": {
-        "callsites": "^3.0.0"
-      }
-    },
     "parse-asn1": {
       "version": "5.1.6",
       "resolved": "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.6.tgz",
@@ -11940,12 +11421,6 @@
       "integrity": "sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw==",
       "dev": true
     },
-    "path-type": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz",
-      "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==",
-      "dev": true
-    },
     "pbkdf2": {
       "version": "3.1.2",
       "resolved": "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.1.2.tgz",
@@ -11978,15 +11453,6 @@
         "find-up": "^4.0.0"
       }
     },
-    "please-upgrade-node": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/please-upgrade-node/-/please-upgrade-node-3.2.0.tgz",
-      "integrity": "sha512-gQR3WpIgNIKwBMVLkpMUeR3e1/E1y42bqDQZfql+kDeXd8COYfM8PQA4X6y7a8u9Ua9FHmsrrmirW2vHs45hWg==",
-      "dev": true,
-      "requires": {
-        "semver-compare": "^1.0.0"
-      }
-    },
     "posix-character-classes": {
       "version": "0.1.1",
       "resolved": "https://registry.npmjs.org/posix-character-classes/-/posix-character-classes-0.1.1.tgz",
@@ -12339,12 +11805,6 @@
         }
       }
     },
-    "resolve-from": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz",
-      "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==",
-      "dev": true
-    },
     "resolve-url": {
       "version": "0.2.1",
       "resolved": "https://registry.npmjs.org/resolve-url/-/resolve-url-0.2.1.tgz",
@@ -12414,18 +11874,6 @@
       "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
       "dev": true
     },
-    "semver-compare": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/semver-compare/-/semver-compare-1.0.0.tgz",
-      "integrity": "sha1-De4hahyUGrN+nvsXiPavxf9VN/w=",
-      "dev": true
-    },
-    "semver-regex": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/semver-regex/-/semver-regex-3.1.2.tgz",
-      "integrity": "sha512-bXWyL6EAKOJa81XG1OZ/Yyuq+oT0b2YLlxx7c+mrdYPaPbnj6WgVULXhinMIeZGufuUBu/eVRqXEhiv4imfwxA==",
-      "dev": true
-    },
     "serialize-javascript": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-4.0.0.tgz",
@@ -12506,12 +11954,6 @@
         "totalist": "^1.0.0"
       }
     },
-    "slash": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
-      "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==",
-      "dev": true
-    },
     "snapdragon": {
       "version": "0.8.2",
       "resolved": "https://registry.npmjs.org/snapdragon/-/snapdragon-0.8.2.tgz",
@@ -13705,12 +13147,6 @@
       "integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=",
       "dev": true
     },
-    "which-pm-runs": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/which-pm-runs/-/which-pm-runs-1.0.0.tgz",
-      "integrity": "sha1-Zws6+8VS4LVd9rd4DKdGFfI60cs=",
-      "dev": true
-    },
     "worker-farm": {
       "version": "1.7.0",
       "resolved": "https://registry.npmjs.org/worker-farm/-/worker-farm-1.7.0.tgz",
@@ -13757,12 +13193,6 @@
       "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz",
       "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g=="
     },
-    "yaml": {
-      "version": "1.10.2",
-      "resolved": "https://registry.npmjs.org/yaml/-/yaml-1.10.2.tgz",
-      "integrity": "sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==",
-      "dev": true
-    },
     "yargs": {
       "version": "13.3.2",
       "resolved": "https://registry.npmjs.org/yargs/-/yargs-13.3.2.tgz",
@@ -13826,12 +13256,6 @@
         "camelcase": "^5.0.0",
         "decamelize": "^1.2.0"
       }
-    },
-    "yocto-queue": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz",
-      "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==",
-      "dev": true
     }
   }
 }