Apply fixes from StyleCI

[ci skip] [skip ci]

.gitattributes

@@ -0,0 +1,20 @@
+**/.gitattributes export-ignore
+**/.gitignore export-ignore
+**/.gitmodules export-ignore
+**/.github export-ignore
+**/.travis export-ignore
+**/.travis.yml export-ignore
+**/.editorconfig export-ignore
+**/.styleci.yml export-ignore
+
+**/phpunit.xml export-ignore
+**/tests export-ignore
+
+**/js/dist/**/* -diff
+**/js/dist/**/* linguist-generated
+**/js/dist-typings/**/* -diff
+**/js/dist-typings/**/* linguist-generated
+**/js/yarn.lock -diff
+**/js/package-lock.json -diff
+
+* text=auto eol=lf

.github/workflows/flarum-akismet-frontend.yml

@@ -18,5 +18,6 @@ jobs:
       backend_directory: ./extensions/akismet
       js_package_manager: yarn
       main_git_branch: main
+
     secrets:
       bundlewatch_github_token: ${{ secrets.BUNDLEWATCH_GITHUB_TOKEN }}

.github/workflows/flarum-approval-frontend.yml

@@ -18,5 +18,6 @@ jobs:
       backend_directory: ./extensions/approval
       js_package_manager: yarn
       main_git_branch: main
+
     secrets:
       bundlewatch_github_token: ${{ secrets.BUNDLEWATCH_GITHUB_TOKEN }}

.github/workflows/flarum-core-frontend.yml

@@ -18,5 +18,6 @@ jobs:
       backend_directory: ./framework/core
       js_package_manager: yarn
       main_git_branch: main
+
     secrets:
       bundlewatch_github_token: ${{ secrets.BUNDLEWATCH_GITHUB_TOKEN }}

.github/workflows/flarum-embed-frontend.yml

@@ -18,5 +18,6 @@ jobs:
       backend_directory: ./extensions/embed
       js_package_manager: yarn
       main_git_branch: main
+
     secrets:
       bundlewatch_github_token: ${{ secrets.BUNDLEWATCH_GITHUB_TOKEN }}

.github/workflows/flarum-emoji-frontend.yml

@@ -18,5 +18,6 @@ jobs:
       backend_directory: ./extensions/emoji
       js_package_manager: yarn
       main_git_branch: main
+
     secrets:
       bundlewatch_github_token: ${{ secrets.BUNDLEWATCH_GITHUB_TOKEN }}

.github/workflows/flarum-flags-frontend.yml

@@ -12,11 +12,12 @@ jobs:
     with:
       enable_bundlewatch: false
       enable_prettier: true
-      enable_typescript: false
+      enable_typescript: true
 
       frontend_directory: ./extensions/flags/js
       backend_directory: ./extensions/flags
       js_package_manager: yarn
       main_git_branch: main
+
     secrets:
       bundlewatch_github_token: ${{ secrets.BUNDLEWATCH_GITHUB_TOKEN }}

.github/workflows/flarum-likes-frontend.yml

@@ -18,5 +18,6 @@ jobs:
       backend_directory: ./extensions/likes
       js_package_manager: yarn
       main_git_branch: main
+
     secrets:
       bundlewatch_github_token: ${{ secrets.BUNDLEWATCH_GITHUB_TOKEN }}

.github/workflows/flarum-lock-frontend.yml

@@ -18,5 +18,6 @@ jobs:
       backend_directory: ./extensions/lock
       js_package_manager: yarn
       main_git_branch: main
+
     secrets:
       bundlewatch_github_token: ${{ secrets.BUNDLEWATCH_GITHUB_TOKEN }}

.github/workflows/flarum-markdown-frontend.yml

@@ -18,5 +18,6 @@ jobs:
       backend_directory: ./extensions/markdown
       js_package_manager: yarn
       main_git_branch: main
+
     secrets:
       bundlewatch_github_token: ${{ secrets.BUNDLEWATCH_GITHUB_TOKEN }}

.github/workflows/flarum-mentions-frontend.yml

@@ -18,5 +18,6 @@ jobs:
       backend_directory: ./extensions/mentions
       js_package_manager: yarn
       main_git_branch: main
+
     secrets:
       bundlewatch_github_token: ${{ secrets.BUNDLEWATCH_GITHUB_TOKEN }}

.github/workflows/flarum-nicknames-frontend.yml

@@ -18,5 +18,6 @@ jobs:
       backend_directory: ./extensions/nicknames
       js_package_manager: yarn
       main_git_branch: main
+
     secrets:
       bundlewatch_github_token: ${{ secrets.BUNDLEWATCH_GITHUB_TOKEN }}

.github/workflows/flarum-package-manager-frontend.yml

@@ -18,5 +18,6 @@ jobs:
       backend_directory: ./extensions/package-manager
       js_package_manager: yarn
       main_git_branch: main
+
     secrets:
       bundlewatch_github_token: ${{ secrets.BUNDLEWATCH_GITHUB_TOKEN }}

.github/workflows/flarum-pusher-frontend.yml

@@ -18,5 +18,6 @@ jobs:
       backend_directory: ./extensions/pusher
       js_package_manager: yarn
       main_git_branch: main
+
     secrets:
       bundlewatch_github_token: ${{ secrets.BUNDLEWATCH_GITHUB_TOKEN }}

.github/workflows/flarum-statistics-frontend.yml

@@ -18,5 +18,6 @@ jobs:
       backend_directory: ./extensions/statistics
       js_package_manager: yarn
       main_git_branch: main
+
     secrets:
       bundlewatch_github_token: ${{ secrets.BUNDLEWATCH_GITHUB_TOKEN }}

.github/workflows/flarum-sticky-frontend.yml

@@ -18,5 +18,6 @@ jobs:
       backend_directory: ./extensions/sticky
       js_package_manager: yarn
       main_git_branch: main
+
     secrets:
       bundlewatch_github_token: ${{ secrets.BUNDLEWATCH_GITHUB_TOKEN }}

.github/workflows/flarum-subscriptions-frontend.yml

@@ -18,5 +18,6 @@ jobs:
       backend_directory: ./extensions/subscriptions
       js_package_manager: yarn
       main_git_branch: main
+
     secrets:
       bundlewatch_github_token: ${{ secrets.BUNDLEWATCH_GITHUB_TOKEN }}

.github/workflows/flarum-suspend-frontend.yml

@@ -18,5 +18,6 @@ jobs:
       backend_directory: ./extensions/suspend
       js_package_manager: yarn
       main_git_branch: main
+
     secrets:
       bundlewatch_github_token: ${{ secrets.BUNDLEWATCH_GITHUB_TOKEN }}

.github/workflows/flarum-tags-frontend.yml

@@ -12,7 +12,7 @@ jobs:
     with:
       enable_bundlewatch: false
       enable_prettier: false
-      enable_typescript: false
+      enable_typescript: true
 
       frontend_directory: ./extensions/tags/js
       backend_directory: ./extensions/tags

.gitignore

@@ -0,0 +1 @@
+node_modules

extensions/akismet/.gitattributes

@@ -1,19 +0,0 @@
-.gitattributes export-ignore
-.gitignore export-ignore
-.gitmodules export-ignore
-.github export-ignore
-.travis export-ignore
-.travis.yml export-ignore
-.editorconfig export-ignore
-.styleci.yml export-ignore
-
-phpunit.xml export-ignore
-tests export-ignore
-
-js/dist/* -diff
-js/dist/* linguist-generated
-js/dist-typings/* linguist-generated
-js/yarn.lock -diff
-js/package-lock.json -diff
-
-* text=auto eol=lf

extensions/akismet/js/package.json

@@ -1,6 +1,7 @@
 {
     "private": true,
     "name": "@flarum/akismet",
+    "version": "0.0.0",
     "prettier": "@flarum/prettier-config",
     "scripts": {
         "dev": "webpack --mode development --watch",
@@ -11,7 +12,7 @@
         "check-typings": "tsc --noEmit --emitDeclarationOnly false",
         "check-typings-coverage": "typescript-coverage-report",
         "clean-typings": "npx rimraf dist-typings && mkdir dist-typings",
-        "build-typings": "yarn run clean-typings && [ -e src/@types ] && cp -r src/@types dist-typings/@types && tsc && yarn run post-build-typings",
+        "build-typings": "yarn run clean-typings && ([ -e src/@types ] && cp -r src/@types dist-typings/@types || true) && tsc && yarn run post-build-typings",
         "post-build-typings": "find dist-typings -type f -name '*.d.ts' -print0 | xargs -0 sed -i 's,../src/@types,@types,g'"
     },
     "devDependencies": {

extensions/akismet/js/src/forum/index.ts

@@ -1,18 +1,22 @@
 import { extend, override } from 'flarum/common/extend';
 import app from 'flarum/forum/app';
+import type Post from 'flarum/common/models/Post';
+import type ItemList from 'flarum/common/utils/ItemList';
 
 import PostControls from 'flarum/forum/utils/PostControls';
 import CommentPost from 'flarum/forum/components/CommentPost';
-import ItemList from 'flarum/common/utils/ItemList';
-import Post from 'flarum/common/models/Post';
+import type Mithril from 'mithril';
 
 app.initializers.add('flarum-akismet', () => {
-  extend(PostControls, 'destructiveControls', function (items: ItemList, post: Post) {
+  extend(PostControls, 'destructiveControls', function (items: ItemList<Mithril.Children>, post: Post) {
     if (items.has('approve')) {
       const flags = post.flags();
 
-      if (flags && flags.some((flag) => flag.type() === 'akismet')) {
-        items.get('approve').children = app.translator.trans('flarum-akismet.forum.post.not_spam_button');
+      if (flags && flags.some((flag) => flag?.type() === 'akismet')) {
+        const approveItem = items.get('approve');
+        if (approveItem && typeof approveItem === 'object' && 'children' in approveItem) {
+          approveItem.children = app.translator.trans('flarum-akismet.forum.post.not_spam_button');
+        }
       }
     }
   });

extensions/akismet/js/tsconfig.json

@@ -4,13 +4,14 @@
   // This will match all .ts, .tsx, .d.ts, .js, .jsx files in your `src` folder
   // and also tells your Typescript server to read core's global typings for
   // access to `dayjs` and `$` in the global namespace.
-  "include": ["src/**/*", "../vendor/flarum/core/js/dist-typings/@types/**/*", "@types/**/*"],
+  "include": ["src/**/*", "../vendor/*/*/js/dist-typings/@types/**/*", "@types/**/*"],
   "compilerOptions": {
     // This will output typings to `dist-typings`
     "declarationDir": "./dist-typings",
     "baseUrl": ".",
     "paths": {
-      "flarum/*": ["../vendor/flarum/core/js/dist-typings/*"]
+      "flarum/*": ["../vendor/flarum/core/js/dist-typings/*"],
+      "flarum/flags/*": ["../vendor/flarum/flags/js/dist-typings/*"]
     }
   }
 }

extensions/approval/.gitattributes

@@ -1,19 +0,0 @@
-.gitattributes export-ignore
-.gitignore export-ignore
-.gitmodules export-ignore
-.github export-ignore
-.travis export-ignore
-.travis.yml export-ignore
-.editorconfig export-ignore
-.styleci.yml export-ignore
-
-phpunit.xml export-ignore
-tests export-ignore
-
-js/dist/* -diff
-js/dist/* linguist-generated
-js/dist-typings/* linguist-generated
-js/yarn.lock -diff
-js/package-lock.json -diff
-
-* text=auto eol=lf

extensions/approval/js/package.json

@@ -1,6 +1,7 @@
 {
     "private": true,
     "name": "@flarum/approval",
+    "version": "0.0.0",
     "prettier": "@flarum/prettier-config",
     "devDependencies": {
         "prettier": "^2.5.1",

extensions/bbcode/.gitattributes

@@ -1,19 +0,0 @@
-.gitattributes export-ignore
-.gitignore export-ignore
-.gitmodules export-ignore
-.github export-ignore
-.travis export-ignore
-.travis.yml export-ignore
-.editorconfig export-ignore
-.styleci.yml export-ignore
-
-phpunit.xml export-ignore
-tests export-ignore
-
-js/dist/* -diff
-js/dist/* linguist-generated
-js/dist-typings/* linguist-generated
-js/yarn.lock -diff
-js/package-lock.json -diff
-
-* text=auto eol=lf

extensions/embed/.gitattributes

@@ -1,19 +0,0 @@
-.gitattributes export-ignore
-.gitignore export-ignore
-.gitmodules export-ignore
-.github export-ignore
-.travis export-ignore
-.travis.yml export-ignore
-.editorconfig export-ignore
-.styleci.yml export-ignore
-
-phpunit.xml export-ignore
-tests export-ignore
-
-js/dist/* -diff
-js/dist/* linguist-generated
-js/dist-typings/* linguist-generated
-js/yarn.lock -diff
-js/package-lock.json -diff
-
-* text=auto eol=lf

extensions/embed/js/package.json

@@ -1,6 +1,7 @@
 {
     "private": true,
     "name": "@flarum/embed",
+    "version": "0.0.0",
     "prettier": "@flarum/prettier-config",
     "dependencies": {
         "iframe-resizer": "^4.3.2"

extensions/emoji/.gitattributes

@@ -1,19 +0,0 @@
-.gitattributes export-ignore
-.gitignore export-ignore
-.gitmodules export-ignore
-.github export-ignore
-.travis export-ignore
-.travis.yml export-ignore
-.editorconfig export-ignore
-.styleci.yml export-ignore
-
-phpunit.xml export-ignore
-tests export-ignore
-
-js/dist/* -diff
-js/dist/* linguist-generated
-js/dist-typings/* linguist-generated
-js/yarn.lock -diff
-js/package-lock.json -diff
-
-* text=auto eol=lf

extensions/emoji/js/package.json

@@ -1,6 +1,7 @@
 {
     "private": true,
     "name": "@flarum/emoji",
+    "version": "0.0.0",
     "prettier": "@flarum/prettier-config",
     "dependencies": {
         "simple-emoji-map": "^0.4.1",

extensions/flags/.gitattributes

@@ -1,19 +0,0 @@
-.gitattributes export-ignore
-.gitignore export-ignore
-.gitmodules export-ignore
-.github export-ignore
-.travis export-ignore
-.travis.yml export-ignore
-.editorconfig export-ignore
-.styleci.yml export-ignore
-
-phpunit.xml export-ignore
-tests export-ignore
-
-js/dist/* -diff
-js/dist/* linguist-generated
-js/dist-typings/* linguist-generated
-js/yarn.lock -diff
-js/package-lock.json -diff
-
-* text=auto eol=lf

extensions/flags/composer.json

@@ -49,7 +49,7 @@
                 "gitConf": true,
                 "githubActions": true,
                 "prettier": true,
-                "typescript": false,
+                "typescript": true,
                 "bundlewatch": false,
                 "backendTesting": true,
                 "editorConfig": true,

extensions/flags/js/dist-typings/@types/shims.d.ts

@@ -0,0 +1,22 @@
+import Flag from '../forum/models/Flag';
+import FlagListState from '../forum/states/FlagListState';
+import Mithril from 'mithril';
+
+declare module 'flarum/common/models/Post' {
+  export default interface Post {
+    flags: () => false | (Flag | undefined)[];
+    canFlag: () => boolean;
+  }
+}
+
+declare module 'flarum/forum/ForumApplication' {
+  export default interface ForumApplication {
+    flags: FlagListState;
+  }
+}
+
+declare module 'flarum/forum/components/Post' {
+  export default interface Post {
+    flagReason: (flag: Flag) => Mithril.Children;
+  }
+}

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

@@ -0,0 +1 @@
+export {};

extensions/flags/js/dist-typings/forum/addFlagControl.d.ts

@@ -0,0 +1 @@
+export default function _default(): void;

extensions/flags/js/dist-typings/forum/addFlagsDropdown.d.ts

@@ -0,0 +1 @@
+export default function _default(): void;

extensions/flags/js/dist-typings/forum/addFlagsToPosts.d.ts

@@ -0,0 +1 @@
+export default function _default(): void;

extensions/flags/js/dist-typings/forum/compat.d.ts

@@ -0,0 +1,19 @@
+declare var _default: {
+    'flags/addFlagsToPosts': typeof addFlagsToPosts;
+    'flags/addFlagControl': typeof addFlagControl;
+    'flags/addFlagsDropdown': typeof addFlagsDropdown;
+    'flags/models/Flag': typeof Flag;
+    'flags/components/FlagList': typeof FlagList;
+    'flags/components/FlagPostModal': typeof FlagPostModal;
+    'flags/components/FlagsPage': typeof FlagsPage;
+    'flags/components/FlagsDropdown': typeof FlagsDropdown;
+};
+export default _default;
+import addFlagsToPosts from "./addFlagsToPosts";
+import addFlagControl from "./addFlagControl";
+import addFlagsDropdown from "./addFlagsDropdown";
+import Flag from "./models/Flag";
+import FlagList from "./components/FlagList";
+import FlagPostModal from "./components/FlagPostModal";
+import FlagsPage from "./components/FlagsPage";
+import FlagsDropdown from "./components/FlagsDropdown";

extensions/flags/js/dist-typings/forum/components/FlagList.d.ts

@@ -0,0 +1,7 @@
+export default class FlagList extends Component<import("flarum/common/Component").ComponentAttrs, undefined> {
+    constructor();
+    oninit(vnode: any): void;
+    state: any;
+    view(): JSX.Element;
+}
+import Component from "flarum/common/Component";

extensions/flags/js/dist-typings/forum/components/FlagPostModal.d.ts

@@ -0,0 +1,15 @@
+/// <reference types="flarum/@types/translator-icu-rich" />
+export default class FlagPostModal extends Modal<import("flarum/common/components/Modal").IInternalModalAttrs> {
+    constructor();
+    oninit(vnode: any): void;
+    success: boolean | undefined;
+    reason: Stream<string> | undefined;
+    reasonDetail: Stream<string> | undefined;
+    title(): import("@askvortsov/rich-icu-message-formatter").NestedStringArray;
+    content(): JSX.Element;
+    flagReasons(): ItemList<any>;
+    onsubmit(e: any): void;
+}
+import Modal from "flarum/common/components/Modal";
+import Stream from "flarum/common/utils/Stream";
+import ItemList from "flarum/common/utils/ItemList";

extensions/flags/js/dist-typings/forum/components/FlagsDropdown.d.ts

@@ -0,0 +1,7 @@
+export default class FlagsDropdown {
+    static initAttrs(attrs: any): void;
+    getMenu(): JSX.Element;
+    goToRoute(): void;
+    getUnreadCount(): any;
+    getNewCount(): unknown;
+}

extensions/flags/js/dist-typings/forum/components/FlagsPage.d.ts

@@ -0,0 +1,9 @@
+/**
+ * The `FlagsPage` component shows the flags list. It is only
+ * used on mobile devices where the flags dropdown is within the drawer.
+ */
+export default class FlagsPage {
+    oninit(vnode: any): void;
+    bodyClass: string | undefined;
+    view(): JSX.Element;
+}

extensions/flags/js/dist-typings/forum/index.d.ts

@@ -0,0 +1 @@
+export {};

extensions/flags/js/dist-typings/forum/models/Flag.d.ts

@@ -0,0 +1,11 @@
+import Model from 'flarum/common/Model';
+import Post from 'flarum/common/models/Post';
+import User from 'flarum/common/models/User';
+export default class Flag extends Model {
+    type(): string;
+    reason(): string | null;
+    reasonDetail(): string | null;
+    createdAt(): Date | null | undefined;
+    post(): false | Post;
+    user(): false | User | null;
+}

extensions/flags/js/dist-typings/forum/states/FlagListState.d.ts

@@ -0,0 +1,16 @@
+export default class FlagListState {
+    constructor(app: any);
+    app: any;
+    /**
+     * Whether or not the flags are loading.
+     *
+     * @type {Boolean}
+     */
+    loading: boolean;
+    /**
+     * Load flags into the application's cache if they haven't already
+     * been loaded.
+     */
+    load(): void;
+    cache: any;
+}

extensions/flags/js/package.json

@@ -1,15 +1,10 @@
 {
     "private": true,
     "name": "@flarum/flags",
+    "version": "0.0.0",
     "prettier": "@flarum/prettier-config",
-    "dependencies": {
-        "@flarum/prettier-config": "^1.0.0",
-        "flarum-webpack-config": "^1.0.0",
-        "flarum-tsconfig": "^1.0.2",
-        "webpack": "^4.46.0",
-        "webpack-cli": "^4.9.1"
-    },
     "devDependencies": {
+        "@types/mithril": "^2.0.8",
         "prettier": "^2.5.1",
         "flarum-webpack-config": "^2.0.0",
         "webpack": "^5.65.0",
@@ -26,8 +21,9 @@
         "format-check": "prettier --check src",
         "analyze": "cross-env ANALYZER=true yarn run build",
         "clean-typings": "npx rimraf dist-typings && mkdir dist-typings",
-        "build-typings": "npm run clean-typings && cp -r src/@types dist-typings/@types && tsc",
+        "build-typings": "yarn run clean-typings && ([ -e src/@types ] && cp -r src/@types dist-typings/@types || true) && tsc && yarn run post-build-typings",
         "check-typings": "tsc --noEmit --emitDeclarationOnly false",
-        "check-typings-coverage": "typescript-coverage-report"
+        "check-typings-coverage": "typescript-coverage-report",
+        "post-build-typings": "find dist-typings -type f -name '*.d.ts' -print0 | xargs -0 sed -i 's,../src/@types,@types,g'"
     }
 }

extensions/flags/js/src/@types/shims.d.ts

@@ -0,0 +1,22 @@
+import Flag from '../forum/models/Flag';
+import FlagListState from '../forum/states/FlagListState';
+import Mithril from 'mithril';
+
+declare module 'flarum/common/models/Post' {
+  export default interface Post {
+    flags: () => false | (Flag | undefined)[];
+    canFlag: () => boolean;
+  }
+}
+
+declare module 'flarum/forum/ForumApplication' {
+  export default interface ForumApplication {
+    flags: FlagListState;
+  }
+}
+
+declare module 'flarum/forum/components/Post' {
+  export default interface Post {
+    flagReason: (flag: Flag) => Mithril.Children;
+  }
+}

extensions/flags/js/src/forum/index.ts

@@ -9,8 +9,8 @@ import addFlagsDropdown from './addFlagsDropdown';
 import addFlagsToPosts from './addFlagsToPosts';
 
 app.initializers.add('flarum-flags', () => {
-  app.store.models.posts.prototype.flags = Model.hasMany('flags');
-  app.store.models.posts.prototype.canFlag = Model.attribute('canFlag');
+  Post.prototype.flags = Model.hasMany<Flag>('flags');
+  Post.prototype.canFlag = Model.attribute<boolean>('canFlag');
 
   app.store.models.flags = Flag;
 
@@ -26,5 +26,6 @@ app.initializers.add('flarum-flags', () => {
 // Expose compat API
 import flagsCompat from './compat';
 import { compat } from '@flarum/core/forum';
+import Post from 'flarum/common/models/Post';
 
 Object.assign(compat, flagsCompat);

extensions/flags/js/src/forum/models/Flag.js

@@ -1,15 +0,0 @@
-import Model from 'flarum/common/Model';
-
-class Flag extends Model {}
-
-Object.assign(Flag.prototype, {
-  type: Model.attribute('type'),
-  reason: Model.attribute('reason'),
-  reasonDetail: Model.attribute('reasonDetail'),
-  createdAt: Model.attribute('createdAt', Model.transformDate),
-
-  post: Model.hasOne('post'),
-  user: Model.hasOne('user'),
-});
-
-export default Flag;

extensions/flags/js/src/forum/models/Flag.ts

@@ -0,0 +1,25 @@
+import Model from 'flarum/common/Model';
+import type Post from 'flarum/common/models/Post';
+import type User from 'flarum/common/models/User';
+
+export default class Flag extends Model {
+  type() {
+    return Model.attribute<string>('type').call(this);
+  }
+  reason() {
+    return Model.attribute<string | null>('reason').call(this);
+  }
+  reasonDetail() {
+    return Model.attribute<string | null>('reasonDetail').call(this);
+  }
+  createdAt() {
+    return Model.attribute('createdAt', Model.transformDate).call(this);
+  }
+
+  post() {
+    return Model.hasOne<Post>('post').call(this);
+  }
+  user() {
+    return Model.hasOne<User | null>('user').call(this);
+  }
+}

extensions/flags/js/tsconfig.json

@@ -0,0 +1,17 @@
+{
+  // Use Flarum's tsconfig as a starting point
+  "extends": "flarum-tsconfig",
+  // This will match all .ts, .tsx, .d.ts, .js, .jsx files in your `src` folder
+  // and also tells your Typescript server to read core's global typings for
+  // access to `dayjs` and `$` in the global namespace.
+  "include": ["src/**/*", "../vendor/*/*/js/dist-typings/@types/**/*", "@types/**/*"],
+  "compilerOptions": {
+    // This will output typings to `dist-typings`
+    "declarationDir": "./dist-typings",
+    "baseUrl": ".",
+    "paths": {
+      "flarum/*": ["../vendor/flarum/core/js/dist-typings/*"],
+      "@flarum/core/*": ["../vendor/flarum/core/js/dist-typings/*"]
+    }
+  }
+}

extensions/lang-english/.gitattributes

@@ -1,19 +0,0 @@
-.gitattributes export-ignore
-.gitignore export-ignore
-.gitmodules export-ignore
-.github export-ignore
-.travis export-ignore
-.travis.yml export-ignore
-.editorconfig export-ignore
-.styleci.yml export-ignore
-
-phpunit.xml export-ignore
-tests export-ignore
-
-js/dist/* -diff
-js/dist/* linguist-generated
-js/dist-typings/* linguist-generated
-js/yarn.lock -diff
-js/package-lock.json -diff
-
-* text=auto eol=lf

extensions/likes/.gitattributes

@@ -1,19 +0,0 @@
-.gitattributes export-ignore
-.gitignore export-ignore
-.gitmodules export-ignore
-.github export-ignore
-.travis export-ignore
-.travis.yml export-ignore
-.editorconfig export-ignore
-.styleci.yml export-ignore
-
-phpunit.xml export-ignore
-tests export-ignore
-
-js/dist/* -diff
-js/dist/* linguist-generated
-js/dist-typings/* linguist-generated
-js/yarn.lock -diff
-js/package-lock.json -diff
-
-* text=auto eol=lf

extensions/likes/js/package.json

@@ -1,6 +1,7 @@
 {
     "private": true,
     "name": "@flarum/likes",
+    "version": "0.0.0",
     "prettier": "@flarum/prettier-config",
     "devDependencies": {
         "prettier": "^2.5.1",

extensions/lock/.gitattributes

@@ -1,19 +0,0 @@
-.gitattributes export-ignore
-.gitignore export-ignore
-.gitmodules export-ignore
-.github export-ignore
-.travis export-ignore
-.travis.yml export-ignore
-.editorconfig export-ignore
-.styleci.yml export-ignore
-
-phpunit.xml export-ignore
-tests export-ignore
-
-js/dist/* -diff
-js/dist/* linguist-generated
-js/dist-typings/* linguist-generated
-js/yarn.lock -diff
-js/package-lock.json -diff
-
-* text=auto eol=lf

extensions/lock/js/package.json

@@ -1,6 +1,7 @@
 {
     "private": true,
     "name": "@flarum/lock",
+    "version": "0.0.0",
     "prettier": "@flarum/prettier-config",
     "devDependencies": {
         "prettier": "^2.5.1",

extensions/markdown/.gitattributes

@@ -1,19 +0,0 @@
-.gitattributes export-ignore
-.gitignore export-ignore
-.gitmodules export-ignore
-.github export-ignore
-.travis export-ignore
-.travis.yml export-ignore
-.editorconfig export-ignore
-.styleci.yml export-ignore
-
-phpunit.xml export-ignore
-tests export-ignore
-
-js/dist/* -diff
-js/dist/* linguist-generated
-js/dist-typings/* linguist-generated
-js/yarn.lock -diff
-js/package-lock.json -diff
-
-* text=auto eol=lf

extensions/markdown/js/package.json

@@ -1,6 +1,7 @@
 {
     "private": true,
     "name": "@flarum/markdown",
+    "version": "0.0.0",
     "prettier": "@flarum/prettier-config",
     "dependencies": {
         "flarum-webpack-config": "^2.0.0",
@@ -14,7 +15,6 @@
         "format-check": "prettier --check src",
         "analyze": "cross-env ANALYZER=true yarn run build"
     },
-    "packageManager": "yarn@3.1.1",
     "devDependencies": {
         "@flarum/prettier-config": "^1.0.0",
         "flarum-tsconfig": "^1.0.2",

extensions/mentions/.gitattributes

@@ -1,19 +0,0 @@
-.gitattributes export-ignore
-.gitignore export-ignore
-.gitmodules export-ignore
-.github export-ignore
-.travis export-ignore
-.travis.yml export-ignore
-.editorconfig export-ignore
-.styleci.yml export-ignore
-
-phpunit.xml export-ignore
-tests export-ignore
-
-js/dist/* -diff
-js/dist/* linguist-generated
-js/dist-typings/* linguist-generated
-js/yarn.lock -diff
-js/package-lock.json -diff
-
-* text=auto eol=lf

extensions/mentions/js/package.json

@@ -1,6 +1,7 @@
 {
     "private": true,
     "name": "@flarum/mentions",
+    "version": "0.0.0",
     "prettier": "@flarum/prettier-config",
     "devDependencies": {
         "prettier": "^2.5.1",

extensions/nicknames/.gitattributes

@@ -1,19 +0,0 @@
-.gitattributes export-ignore
-.gitignore export-ignore
-.gitmodules export-ignore
-.github export-ignore
-.travis export-ignore
-.travis.yml export-ignore
-.editorconfig export-ignore
-.styleci.yml export-ignore
-
-phpunit.xml export-ignore
-tests export-ignore
-
-js/dist/* -diff
-js/dist/* linguist-generated
-js/dist-typings/* linguist-generated
-js/yarn.lock -diff
-js/package-lock.json -diff
-
-* text=auto eol=lf

extensions/package-manager/.gitattributes

@@ -1,19 +0,0 @@
-.gitattributes export-ignore
-.gitignore export-ignore
-.gitmodules export-ignore
-.github export-ignore
-.travis export-ignore
-.travis.yml export-ignore
-.editorconfig export-ignore
-.styleci.yml export-ignore
-
-phpunit.xml export-ignore
-tests export-ignore
-
-js/dist/* -diff
-js/dist/* linguist-generated
-js/dist-typings/* linguist-generated
-js/yarn.lock -diff
-js/package-lock.json -diff
-
-* text=auto eol=lf

extensions/package-manager/js/package.json

@@ -1,7 +1,7 @@
 {
+    "private": true,
     "name": "@flarum/package-manager",
     "version": "0.0.0",
-    "private": true,
     "prettier": "@flarum/prettier-config",
     "devDependencies": {
         "prettier": "^2.5.1",
@@ -21,7 +21,7 @@
         "ci": "yarn install --immutable --immutable-cache",
         "analyze": "cross-env ANALYZER=true yarn run build",
         "clean-typings": "npx rimraf dist-typings && mkdir dist-typings",
-        "build-typings": "yarn run clean-typings && [ -e src/@types ] && cp -r src/@types dist-typings/@types && tsc && yarn run post-build-typings",
+        "build-typings": "yarn run clean-typings && ([ -e src/@types ] && cp -r src/@types dist-typings/@types || true) && tsc && yarn run post-build-typings",
         "check-typings": "tsc --noEmit --emitDeclarationOnly false",
         "check-typings-coverage": "typescript-coverage-report",
         "post-build-typings": "find dist-typings -type f -name '*.d.ts' -print0 | xargs -0 sed -i 's,../src/@types,@types,g'"

extensions/package-manager/js/src/admin/components/Installer.tsx

@@ -46,7 +46,7 @@ export default class Installer<Attrs> extends Component<Attrs> {
     app.modal.show(LoadingModal);
 
     app
-      .request({
+      .request<{ id: string }>({
         method: 'POST',
         url: `${app.forum.attribute('apiUrl')}/package-manager/extensions`,
         body: {

extensions/package-manager/js/src/admin/components/Updater.tsx

@@ -3,6 +3,7 @@ import app from 'flarum/admin/app';
 import Component from 'flarum/common/Component';
 import Button from 'flarum/common/components/Button';
 import humanTime from 'flarum/common/helpers/humanTime';
+import extractText from 'flarum/common/utils/extractText';
 import LoadingModal from 'flarum/admin/components/LoadingModal';
 import errorHandler from '../utils/errorHandler';
 import LoadingIndicator from 'flarum/common/components/LoadingIndicator';
@@ -188,7 +189,7 @@ export default class Updater<Attrs> extends Component<Attrs> {
   }
 
   updateCoreMinor() {
-    if (confirm(app.translator.trans('flarum-package-manager.admin.minor_update_confirmation.content'))) {
+    if (confirm(extractText(app.translator.trans('flarum-package-manager.admin.minor_update_confirmation.content')))) {
       app.modal.show(LoadingModal);
       this.isLoading = 'minor-update';
 

extensions/package-manager/src/Command/UpdateExtensionHandler.php

@@ -52,8 +52,7 @@ class UpdateExtensionHandler
         UpdateExtensionValidator $validator,
         LastUpdateCheck $lastUpdateCheck,
         Dispatcher $events
-    )
-    {
+    ) {
         $this->composer = $composer;
         $this->extensions = $extensions;
         $this->validator = $validator;

extensions/pusher/.gitattributes

@@ -1,19 +0,0 @@
-.gitattributes export-ignore
-.gitignore export-ignore
-.gitmodules export-ignore
-.github export-ignore
-.travis export-ignore
-.travis.yml export-ignore
-.editorconfig export-ignore
-.styleci.yml export-ignore
-
-phpunit.xml export-ignore
-tests export-ignore
-
-js/dist/* -diff
-js/dist/* linguist-generated
-js/dist-typings/* linguist-generated
-js/yarn.lock -diff
-js/package-lock.json -diff
-
-* text=auto eol=lf

extensions/pusher/composer.json

@@ -22,6 +22,9 @@
         "flarum/core": "^1.2",
         "pusher/pusher-php-server": "^2.2"
     },
+    "require-dev": {
+        "flarum/tags": "^1.0"
+    },
     "autoload": {
         "psr-4": {
             "Flarum\\Pusher\\": "src/"

extensions/pusher/js/package.json

@@ -1,6 +1,7 @@
 {
     "private": true,
     "name": "@flarum/pusher",
+    "version": "0.0.0",
     "prettier": "@flarum/prettier-config",
     "scripts": {
         "dev": "webpack --mode development --watch",
@@ -9,7 +10,7 @@
         "format": "prettier --write src",
         "format-check": "prettier --check src",
         "clean-typings": "npx rimraf dist-typings && mkdir dist-typings",
-        "build-typings": "yarn run clean-typings && [ -e src/@types ] && cp -r src/@types dist-typings/@types && tsc && yarn run post-build-typings",
+        "build-typings": "yarn run clean-typings && ([ -e src/@types ] && cp -r src/@types dist-typings/@types || true) && tsc && yarn run post-build-typings",
         "check-typings": "tsc --noEmit --emitDeclarationOnly false",
         "check-typings-coverage": "typescript-coverage-report",
         "post-build-typings": "find dist-typings -type f -name '*.d.ts' -print0 | xargs -0 sed -i 's,../src/@types,@types,g'"

extensions/pusher/js/src/forum/index.ts

@@ -6,7 +6,8 @@ import DiscussionPage from 'flarum/forum/components/DiscussionPage';
 import IndexPage from 'flarum/forum/components/IndexPage';
 import Button from 'flarum/common/components/Button';
 import ItemList from 'flarum/common/utils/ItemList';
-import { Children, VnodeDOM } from 'mithril';
+import type { Children } from 'mithril';
+import type Tag from 'flarum/tags/common/models/Tag';
 
 export type PusherBinding = {
   channels: {
@@ -47,14 +48,15 @@ app.initializers.add('flarum-pusher', () => {
     app.pusher.then((binding: PusherBinding) => {
       const pusher = binding.pusher;
 
-      pusher.bind('newPost', (data: { tagIds: number[]; discussionId: number }) => {
+      pusher.bind('newPost', (data: { tagIds: string[]; discussionId: number }) => {
         const params = app.discussions.getParams();
 
         if (!params.q && !params.sort && !params.filter) {
           if (params.tags) {
-            const tag = app.store.getBy('tags', 'slug', params.tags);
+            const tag = app.store.getBy<Tag>('tags', 'slug', params.tags);
+            const tagId = tag?.id();
 
-            if (!data.tagIds.includes(tag.id())) return;
+            if (!tagId || !data.tagIds.includes(tagId)) return;
           }
 
           const id = String(data.discussionId);
@@ -79,11 +81,11 @@ app.initializers.add('flarum-pusher', () => {
     });
   });
 
-  extend(DiscussionList.prototype, 'view', function (this: DiscussionList, vdom: VnodeDOM) {
+  extend(DiscussionList.prototype, 'view', function (this: DiscussionList, vdom: Children) {
     if (app.pushedUpdates) {
       const count = app.pushedUpdates.length;
 
-      if (count) {
+      if (count && typeof vdom === 'object' && vdom && 'children' in vdom && vdom.children instanceof Array) {
         vdom.children.unshift(
           Button.component(
             {

extensions/pusher/js/src/forum/shims.d.ts

@@ -13,3 +13,9 @@ declare module 'flarum/forum/ForumApplication' {
     pushedUpdates: Array<any>;
   }
 }
+
+declare module 'flarum/forum/components/DiscussionList' {
+  export default interface DiscussionList {
+    loadingUpdated?: boolean;
+  }
+}

extensions/pusher/js/tsconfig.json

@@ -4,13 +4,14 @@
   // This will match all .ts, .tsx, .d.ts, .js, .jsx files in your `src` folder
   // and also tells your Typescript server to read core's global typings for
   // access to `dayjs` and `$` in the global namespace.
-  "include": ["src/**/*", "../vendor/flarum/core/js/dist-typings/@types/**/*", "@types/**/*"],
+  "include": ["src/**/*", "../vendor/*/*/js/dist-typings/@types/**/*", "@types/**/*"],
   "compilerOptions": {
     // This will output typings to `dist-typings`
     "declarationDir": "./dist-typings",
     "baseUrl": ".",
     "paths": {
-      "flarum/*": ["../vendor/flarum/core/js/dist-typings/*"]
+      "flarum/*": ["../vendor/flarum/core/js/dist-typings/*"],
+      "flarum/tags/*": ["../vendor/flarum/tags/js/dist-typings/*"]
     }
   }
 }

extensions/statistics/.gitattributes

@@ -1,19 +0,0 @@
-.gitattributes export-ignore
-.gitignore export-ignore
-.gitmodules export-ignore
-.github export-ignore
-.travis export-ignore
-.travis.yml export-ignore
-.editorconfig export-ignore
-.styleci.yml export-ignore
-
-phpunit.xml export-ignore
-tests export-ignore
-
-js/dist/* -diff
-js/dist/* linguist-generated
-js/dist-typings/* linguist-generated
-js/yarn.lock -diff
-js/package-lock.json -diff
-
-* text=auto eol=lf

extensions/statistics/js/package.json

@@ -1,6 +1,7 @@
 {
     "private": true,
     "name": "@flarum/statistics",
+    "version": "0.0.0",
     "prettier": "@flarum/prettier-config",
     "dependencies": {
         "frappe-charts": "^1.6.2"
@@ -23,7 +24,7 @@
         "format-check": "prettier --check src",
         "analyze": "cross-env ANALYZER=true yarn run build",
         "clean-typings": "npx rimraf dist-typings && mkdir dist-typings",
-        "build-typings": "yarn run clean-typings && [ -e src/@types ] && cp -r src/@types dist-typings/@types && tsc && yarn run post-build-typings",
+        "build-typings": "yarn run clean-typings && ([ -e src/@types ] && cp -r src/@types dist-typings/@types || true) && tsc && yarn run post-build-typings",
         "check-typings": "tsc --noEmit --emitDeclarationOnly false",
         "check-typings-coverage": "typescript-coverage-report",
         "ci": "yarn install --immutable --immutable-cache",

extensions/sticky/.gitattributes

@@ -1,19 +0,0 @@
-.gitattributes export-ignore
-.gitignore export-ignore
-.gitmodules export-ignore
-.github export-ignore
-.travis export-ignore
-.travis.yml export-ignore
-.editorconfig export-ignore
-.styleci.yml export-ignore
-
-phpunit.xml export-ignore
-tests export-ignore
-
-js/dist/* -diff
-js/dist/* linguist-generated
-js/dist-typings/* linguist-generated
-js/yarn.lock -diff
-js/package-lock.json -diff
-
-* text=auto eol=lf

extensions/sticky/js/package.json

@@ -1,6 +1,7 @@
 {
     "private": true,
     "name": "@flarum/sticky",
+    "version": "0.0.0",
     "prettier": "@flarum/prettier-config",
     "devDependencies": {
         "prettier": "^2.5.1",

extensions/subscriptions/.gitattributes

@@ -1,19 +0,0 @@
-.gitattributes export-ignore
-.gitignore export-ignore
-.gitmodules export-ignore
-.github export-ignore
-.travis export-ignore
-.travis.yml export-ignore
-.editorconfig export-ignore
-.styleci.yml export-ignore
-
-phpunit.xml export-ignore
-tests export-ignore
-
-js/dist/* -diff
-js/dist/* linguist-generated
-js/dist-typings/* linguist-generated
-js/yarn.lock -diff
-js/package-lock.json -diff
-
-* text=auto eol=lf

extensions/subscriptions/js/package.json

@@ -1,6 +1,7 @@
 {
     "private": true,
     "name": "@flarum/subscriptions",
+    "version": "0.0.0",
     "prettier": "@flarum/prettier-config",
     "devDependencies": {
         "prettier": "^2.5.1",

extensions/suspend/.gitattributes

@@ -1,19 +0,0 @@
-.gitattributes export-ignore
-.gitignore export-ignore
-.gitmodules export-ignore
-.github export-ignore
-.travis export-ignore
-.travis.yml export-ignore
-.editorconfig export-ignore
-.styleci.yml export-ignore
-
-phpunit.xml export-ignore
-tests export-ignore
-
-js/dist/* -diff
-js/dist/* linguist-generated
-js/dist-typings/* linguist-generated
-js/yarn.lock -diff
-js/package-lock.json -diff
-
-* text=auto eol=lf

extensions/suspend/js/package.json

@@ -1,6 +1,7 @@
 {
     "private": true,
     "name": "@flarum/suspend",
+    "version": "0.0.0",
     "prettier": "@flarum/prettier-config",
     "scripts": {
         "dev": "webpack --mode development --watch",

extensions/tags/.gitattributes

@@ -1,19 +0,0 @@
-.gitattributes export-ignore
-.gitignore export-ignore
-.gitmodules export-ignore
-.github export-ignore
-.travis export-ignore
-.travis.yml export-ignore
-.editorconfig export-ignore
-.styleci.yml export-ignore
-
-phpunit.xml export-ignore
-tests export-ignore
-
-js/dist/* -diff
-js/dist/* linguist-generated
-js/dist-typings/* linguist-generated
-js/yarn.lock -diff
-js/package-lock.json -diff
-
-* text=auto eol=lf

extensions/tags/composer.json

@@ -54,7 +54,7 @@
                 "gitConf": true,
                 "githubActions": true,
                 "prettier": false,
-                "typescript": false,
+                "typescript": true,
                 "bundlewatch": false,
                 "backendTesting": true,
                 "editorConfig": true,

extensions/tags/js/dist-typings/@types/shims.d.ts

@@ -0,0 +1,21 @@
+import type Tag from "../common/models/Tag";
+import type TagListState from "../forum/states/TagListState";
+
+declare module 'flarum/forum/routes' {
+  export interface ForumRoutes {
+    tag: (tag: Tag) => string;
+  }
+}
+
+declare module 'flarum/forum/ForumApplication' {
+  export default interface ForumApplication {
+    tagList: TagListState;
+  }
+}
+
+declare module 'flarum/common/models/Discussion' {
+  export default interface Discussion {
+    tags: () => false | (Tag | undefined)[];
+    canTag: () => boolean | undefined;
+  }
+}

extensions/tags/js/dist-typings/admin/addTagChangePermission.d.ts

@@ -0,0 +1 @@
+export default function _default(): void;

extensions/tags/js/dist-typings/admin/addTagPermission.d.ts

@@ -0,0 +1 @@
+export default function _default(): void;

extensions/tags/js/dist-typings/admin/addTagsHomePageOption.d.ts

@@ -0,0 +1 @@
+export default function _default(): void;

extensions/tags/js/dist-typings/admin/addTagsPermissionScope.d.ts

@@ -0,0 +1 @@
+export default function _default(): void;

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

@@ -0,0 +1,21 @@
+declare var _default: {
+    'tags/utils/sortTags': typeof import("../common/utils/sortTags").default;
+    'tags/models/Tag': typeof import("../common/models/Tag").default;
+    'tags/helpers/tagsLabel': typeof import("../common/helpers/tagsLabel").default;
+    'tags/helpers/tagIcon': typeof import("../common/helpers/tagIcon").default;
+    'tags/helpers/tagLabel': typeof import("../common/helpers/tagLabel").default;
+} & {
+    'tags/addTagsHomePageOption': typeof addTagsHomePageOption;
+    'tags/addTagChangePermission': typeof addTagChangePermission;
+    'tags/components/TagsPage': typeof TagsPage;
+    'tags/components/EditTagModal': typeof EditTagModal;
+    'tags/addTagPermission': typeof addTagPermission;
+    'tags/addTagsPermissionScope': typeof addTagsPermissionScope;
+};
+export default _default;
+import addTagsHomePageOption from "./addTagsHomePageOption";
+import addTagChangePermission from "./addTagChangePermission";
+import TagsPage from "./components/TagsPage";
+import EditTagModal from "./components/EditTagModal";
+import addTagPermission from "./addTagPermission";
+import addTagsPermissionScope from "./addTagsPermissionScope";

extensions/tags/js/dist-typings/admin/components/EditTagModal.d.ts

@@ -0,0 +1,34 @@
+/// <reference types="flarum/@types/translator-icu-rich" />
+/**
+ * The `EditTagModal` component shows a modal dialog which allows the user
+ * to create or edit a tag.
+ */
+export default class EditTagModal extends Modal<import("flarum/common/components/Modal").IInternalModalAttrs> {
+    constructor();
+    oninit(vnode: any): void;
+    tag: any;
+    name: Stream<any> | undefined;
+    slug: Stream<any> | undefined;
+    description: Stream<any> | undefined;
+    color: Stream<any> | undefined;
+    icon: Stream<any> | undefined;
+    isHidden: Stream<any> | undefined;
+    primary: Stream<any> | undefined;
+    title(): import("@askvortsov/rich-icu-message-formatter").NestedStringArray | import("mithril").Vnode<any, any>;
+    content(): JSX.Element;
+    fields(): ItemList<any>;
+    submitData(): {
+        name: any;
+        slug: any;
+        description: any;
+        color: any;
+        icon: any;
+        isHidden: any;
+        primary: any;
+    };
+    onsubmit(e: any): void;
+    delete(): void;
+}
+import Modal from "flarum/common/components/Modal";
+import Stream from "flarum/common/utils/Stream";
+import ItemList from "flarum/common/utils/ItemList";

extensions/tags/js/dist-typings/admin/components/TagsPage.d.ts

@@ -0,0 +1,10 @@
+export default class TagsPage extends ExtensionPage<import("flarum/admin/components/ExtensionPage").ExtensionPageAttrs> {
+    constructor();
+    oninit(vnode: any): void;
+    forcedRefreshKey: number | undefined;
+    content(): JSX.Element;
+    onListOnCreate(vnode: any): void;
+    setMinTags(minTags: any, maxTags: any, value: any): void;
+    onSortUpdate(e: any): void;
+}
+import ExtensionPage from "flarum/admin/components/ExtensionPage";

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

@@ -0,0 +1 @@
+export {};

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

@@ -0,0 +1,13 @@
+declare var _default: {
+    'tags/utils/sortTags': typeof sortTags;
+    'tags/models/Tag': typeof Tag;
+    'tags/helpers/tagsLabel': typeof tagsLabel;
+    'tags/helpers/tagIcon': typeof tagIcon;
+    'tags/helpers/tagLabel': typeof tagLabel;
+};
+export default _default;
+import sortTags from "./utils/sortTags";
+import Tag from "./models/Tag";
+import tagsLabel from "./helpers/tagsLabel";
+import tagIcon from "./helpers/tagIcon";
+import tagLabel from "./helpers/tagLabel";