From 0d9c95b0960c5a260c569de43bdc39682a8c56de Mon Sep 17 00:00:00 2001 From: Ian Morland <16573496+imorland@users.noreply.github.com> Date: Sat, 8 Jan 2022 21:57:13 +0000 Subject: [PATCH] [chore] Update JS imports (#80) --- extensions/mentions/js/package-lock.json | 164 ++++++++++-------- extensions/mentions/js/package.json | 15 +- .../js/src/admin/{index.js => index.ts} | 2 + .../js/src/forum/addComposerAutocomplete.js | 1 + .../js/src/forum/addMentionedByList.js | 1 + .../js/src/forum/addPostQuoteButton.js | 5 +- .../js/src/forum/addPostReplyAction.js | 7 +- .../src/forum/components/MentionsUserPage.js | 3 +- .../components/PostMentionedNotification.js | 5 +- .../components/UserMentionedNotification.js | 5 +- .../forum/fragments/AutocompleteDropdown.js | 2 +- .../js/src/forum/fragments/PostQuoteButton.js | 5 +- extensions/mentions/js/src/forum/index.js | 12 +- .../js/src/forum/utils/getCleanDisplayName.js | 1 + .../mentions/js/src/forum/utils/reply.js | 1 + .../js/src/forum/utils/textFormatter.js | 5 +- 16 files changed, 132 insertions(+), 102 deletions(-) rename extensions/mentions/js/src/admin/{index.js => index.ts} (91%) diff --git a/extensions/mentions/js/package-lock.json b/extensions/mentions/js/package-lock.json index d0c5e461b..65dcf4cdc 100644 --- a/extensions/mentions/js/package-lock.json +++ b/extensions/mentions/js/package-lock.json @@ -6,14 +6,14 @@ "": { "name": "@flarum/mentions", "dependencies": { + "@flarum/prettier-config": "^1.0.0", + "flarum-tsconfig": "^1.0.2", "flarum-webpack-config": "^1.0.0", "webpack": "^4.46.0", - "webpack-cli": "^4.7.2" + "webpack-cli": "^4.9.1" }, "devDependencies": { - "@flarum/prettier-config": "^1.0.0", - "@types/mithril": "^2.0.8", - "flarum-tsconfig": "^1.0.0" + "prettier": "^2.5.1" } }, "node_modules/@babel/code-frame": { @@ -1437,8 +1437,7 @@ "node_modules/@flarum/prettier-config": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/@flarum/prettier-config/-/prettier-config-1.0.0.tgz", - "integrity": "sha512-3/AcliIi5jPt4i7COb5hsLv6hm4EeXT9yI9I2EuEvhPi2QR+O9Y/8wrqRuO5mDkRzCIhUY+mjIL/f9770Zwfqg==", - "dev": true + "integrity": "sha512-3/AcliIi5jPt4i7COb5hsLv6hm4EeXT9yI9I2EuEvhPi2QR+O9Y/8wrqRuO5mDkRzCIhUY+mjIL/f9770Zwfqg==" }, "node_modules/@polka/url": { "version": "1.0.0-next.12", @@ -1449,7 +1448,6 @@ "version": "3.5.6", "resolved": "https://registry.npmjs.org/@types/jquery/-/jquery-3.5.6.tgz", "integrity": "sha512-SmgCQRzGPId4MZQKDj9Hqc6kSXFNWZFHpELkyK8AQhf8Zr6HKfCzFv9ZC1Fv3FyQttJZOlap3qYb12h61iZAIg==", - "dev": true, "dependencies": { "@types/sizzle": "*" } @@ -1462,14 +1460,17 @@ "node_modules/@types/mithril": { "version": "2.0.8", "resolved": "https://registry.npmjs.org/@types/mithril/-/mithril-2.0.8.tgz", - "integrity": "sha512-QzVV70DqUhWfLFpMFDBI9rRxtzeUUpbhiFDpUJYSV92AePgl+Qfficgv2MOb1Ceb+lBOQU8+L+Hjf2UielQjEw==", - "dev": true + "integrity": "sha512-QzVV70DqUhWfLFpMFDBI9rRxtzeUUpbhiFDpUJYSV92AePgl+Qfficgv2MOb1Ceb+lBOQU8+L+Hjf2UielQjEw==" }, "node_modules/@types/sizzle": { "version": "2.3.3", "resolved": "https://registry.npmjs.org/@types/sizzle/-/sizzle-2.3.3.tgz", - "integrity": "sha512-JYM8x9EGF163bEyhdJBpR2QX1R5naCJHC8ucJylJ3w9/CVBaskdQ8WqBf8MmQrd1kRvp/a4TS8HJ+bxzR7ZJYQ==", - "dev": true + "integrity": "sha512-JYM8x9EGF163bEyhdJBpR2QX1R5naCJHC8ucJylJ3w9/CVBaskdQ8WqBf8MmQrd1kRvp/a4TS8HJ+bxzR7ZJYQ==" + }, + "node_modules/@types/throttle-debounce": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/@types/throttle-debounce/-/throttle-debounce-2.1.0.tgz", + "integrity": "sha512-5eQEtSCoESnh2FsiLTxE121IiE60hnMqcb435fShf4bpLRjEu1Eoekht23y6zXS9Ts3l+Szu3TARnTsA0GkOkQ==" }, "node_modules/@webassemblyjs/ast": { "version": "1.9.0", @@ -1629,18 +1630,18 @@ } }, "node_modules/@webpack-cli/configtest": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/@webpack-cli/configtest/-/configtest-1.0.4.tgz", - "integrity": "sha512-cs3XLy+UcxiP6bj0A6u7MLLuwdXJ1c3Dtc0RkKg+wiI1g/Ti1om8+/2hc2A2B60NbBNAbMgyBMHvyymWm/j4wQ==", + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@webpack-cli/configtest/-/configtest-1.1.0.tgz", + "integrity": "sha512-ttOkEkoalEHa7RaFYpM0ErK1xc4twg3Am9hfHhL7MVqlHebnkYd2wuI/ZqTDj0cVzZho6PdinY0phFZV3O0Mzg==", "peerDependencies": { "webpack": "4.x.x || 5.x.x", "webpack-cli": "4.x.x" } }, "node_modules/@webpack-cli/info": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/@webpack-cli/info/-/info-1.3.0.tgz", - "integrity": "sha512-ASiVB3t9LOKHs5DyVUcxpraBXDOKubYu/ihHhU+t1UPpxsivg6Od2E2qU4gJCekfEddzRBzHhzA/Acyw/mlK/w==", + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/@webpack-cli/info/-/info-1.4.0.tgz", + "integrity": "sha512-F6b+Man0rwE4n0409FyAJHStYA5OIZERxmnUfLVwv0mc0V1wLad3V7jqRlMkgKBeAq07jUvglacNaa6g9lOpuw==", "dependencies": { "envinfo": "^7.7.3" }, @@ -1649,9 +1650,9 @@ } }, "node_modules/@webpack-cli/serve": { - "version": "1.5.1", - "resolved": "https://registry.npmjs.org/@webpack-cli/serve/-/serve-1.5.1.tgz", - "integrity": "sha512-4vSVUiOPJLmr45S8rMGy7WDvpWxfFxfP/Qx/cxZFCfvoypTYpPPL1X8VIZMe0WTA+Jr7blUxwUSEZNkjoMTgSw==", + "version": "1.6.0", + "resolved": "https://registry.npmjs.org/@webpack-cli/serve/-/serve-1.6.0.tgz", + "integrity": "sha512-ZkVeqEmRpBV2GHvjjUZqEai2PpUbuq8Bqd//vEYsp63J8WyexI8ppCqVS3Zs0QADf6aWuPdU+0XsPI647PVlQA==", "peerDependencies": { "webpack-cli": "4.x.x" }, @@ -2637,8 +2638,7 @@ "node_modules/dayjs": { "version": "1.10.6", "resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.10.6.tgz", - "integrity": "sha512-AztC/IOW4L1Q41A86phW5Thhcrco3xuAA+YX/BLpLWWjRcTj5TOt/QImBLmCKlrF7u7k47arTnOyL6GnbG8Hvw==", - "dev": true + "integrity": "sha512-AztC/IOW4L1Q41A86phW5Thhcrco3xuAA+YX/BLpLWWjRcTj5TOt/QImBLmCKlrF7u7k47arTnOyL6GnbG8Hvw==" }, "node_modules/debug": { "version": "4.3.1", @@ -3195,13 +3195,13 @@ } }, "node_modules/flarum-tsconfig": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/flarum-tsconfig/-/flarum-tsconfig-1.0.0.tgz", - "integrity": "sha512-RknV9A3Mv2/PRLEzZAukH+zAN15z2vz7y0kHX5eCRBPXUDZo8TfGpO3gjFDIhbL9PCr/tnpkcvChK2SQjKxVMw==", - "dev": true, + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/flarum-tsconfig/-/flarum-tsconfig-1.0.2.tgz", + "integrity": "sha512-RUaN7D6noLK9vY1F86NIc+IlIP1YAA3bJ4jGR5pIm8UxvLBLW8qrAHzIosuQJgvnge7VgTA5c2LoNefUK/9EiQ==", "dependencies": { "@types/jquery": "^3.5.5", "@types/mithril": "^2.0.7", + "@types/throttle-debounce": "^2.1.0", "dayjs": "^1.10.4" } }, @@ -4504,6 +4504,18 @@ "node": ">=0.10.0" } }, + "node_modules/prettier": { + "version": "2.5.1", + "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.5.1.tgz", + "integrity": "sha512-vBZcPRUR5MZJwoyi3ZoyQlc1rXeEck8KgeC9AwwOn+exuxLxq5toTRDTSaVrXHxelDMHy9zlicw8u66yxoSUFg==", + "dev": true, + "bin": { + "prettier": "bin-prettier.js" + }, + "engines": { + "node": ">=10.13.0" + } + }, "node_modules/process": { "version": "0.11.10", "resolved": "https://registry.npmjs.org/process/-/process-0.11.10.tgz", @@ -5692,11 +5704,6 @@ "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=" }, - "node_modules/v8-compile-cache": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz", - "integrity": "sha512-l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA==" - }, "node_modules/vm-browserify": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/vm-browserify/-/vm-browserify-1.1.2.tgz", @@ -5998,22 +6005,21 @@ } }, "node_modules/webpack-cli": { - "version": "4.7.2", - "resolved": "https://registry.npmjs.org/webpack-cli/-/webpack-cli-4.7.2.tgz", - "integrity": "sha512-mEoLmnmOIZQNiRl0ebnjzQ74Hk0iKS5SiEEnpq3dRezoyR3yPaeQZCMCe+db4524pj1Pd5ghZXjT41KLzIhSLw==", + "version": "4.9.1", + "resolved": "https://registry.npmjs.org/webpack-cli/-/webpack-cli-4.9.1.tgz", + "integrity": "sha512-JYRFVuyFpzDxMDB+v/nanUdQYcZtqFPGzmlW4s+UkPMFhSpfRNmf1z4AwYcHJVdvEFAM7FFCQdNTpsBYhDLusQ==", "dependencies": { "@discoveryjs/json-ext": "^0.5.0", - "@webpack-cli/configtest": "^1.0.4", - "@webpack-cli/info": "^1.3.0", - "@webpack-cli/serve": "^1.5.1", - "colorette": "^1.2.1", + "@webpack-cli/configtest": "^1.1.0", + "@webpack-cli/info": "^1.4.0", + "@webpack-cli/serve": "^1.6.0", + "colorette": "^2.0.14", "commander": "^7.0.0", "execa": "^5.0.0", "fastest-levenshtein": "^1.0.12", "import-local": "^3.0.2", "interpret": "^2.2.0", "rechoir": "^0.7.0", - "v8-compile-cache": "^2.2.0", "webpack-merge": "^5.7.3" }, "bin": { @@ -6040,6 +6046,11 @@ } } }, + "node_modules/webpack-cli/node_modules/colorette": { + "version": "2.0.16", + "resolved": "https://registry.npmjs.org/colorette/-/colorette-2.0.16.tgz", + "integrity": "sha512-hUewv7oMjCp+wkBv5Rm0v87eJhq4woh5rSR+42YSQJKecCqgIqNkZ6lAlQms/BwHPJA5NKMRlpxPRv0n8HQW6g==" + }, "node_modules/webpack-cli/node_modules/commander": { "version": "7.2.0", "resolved": "https://registry.npmjs.org/commander/-/commander-7.2.0.tgz", @@ -7245,8 +7256,7 @@ "@flarum/prettier-config": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/@flarum/prettier-config/-/prettier-config-1.0.0.tgz", - "integrity": "sha512-3/AcliIi5jPt4i7COb5hsLv6hm4EeXT9yI9I2EuEvhPi2QR+O9Y/8wrqRuO5mDkRzCIhUY+mjIL/f9770Zwfqg==", - "dev": true + "integrity": "sha512-3/AcliIi5jPt4i7COb5hsLv6hm4EeXT9yI9I2EuEvhPi2QR+O9Y/8wrqRuO5mDkRzCIhUY+mjIL/f9770Zwfqg==" }, "@polka/url": { "version": "1.0.0-next.12", @@ -7257,7 +7267,6 @@ "version": "3.5.6", "resolved": "https://registry.npmjs.org/@types/jquery/-/jquery-3.5.6.tgz", "integrity": "sha512-SmgCQRzGPId4MZQKDj9Hqc6kSXFNWZFHpELkyK8AQhf8Zr6HKfCzFv9ZC1Fv3FyQttJZOlap3qYb12h61iZAIg==", - "dev": true, "requires": { "@types/sizzle": "*" } @@ -7270,14 +7279,17 @@ "@types/mithril": { "version": "2.0.8", "resolved": "https://registry.npmjs.org/@types/mithril/-/mithril-2.0.8.tgz", - "integrity": "sha512-QzVV70DqUhWfLFpMFDBI9rRxtzeUUpbhiFDpUJYSV92AePgl+Qfficgv2MOb1Ceb+lBOQU8+L+Hjf2UielQjEw==", - "dev": true + "integrity": "sha512-QzVV70DqUhWfLFpMFDBI9rRxtzeUUpbhiFDpUJYSV92AePgl+Qfficgv2MOb1Ceb+lBOQU8+L+Hjf2UielQjEw==" }, "@types/sizzle": { "version": "2.3.3", "resolved": "https://registry.npmjs.org/@types/sizzle/-/sizzle-2.3.3.tgz", - "integrity": "sha512-JYM8x9EGF163bEyhdJBpR2QX1R5naCJHC8ucJylJ3w9/CVBaskdQ8WqBf8MmQrd1kRvp/a4TS8HJ+bxzR7ZJYQ==", - "dev": true + "integrity": "sha512-JYM8x9EGF163bEyhdJBpR2QX1R5naCJHC8ucJylJ3w9/CVBaskdQ8WqBf8MmQrd1kRvp/a4TS8HJ+bxzR7ZJYQ==" + }, + "@types/throttle-debounce": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/@types/throttle-debounce/-/throttle-debounce-2.1.0.tgz", + "integrity": "sha512-5eQEtSCoESnh2FsiLTxE121IiE60hnMqcb435fShf4bpLRjEu1Eoekht23y6zXS9Ts3l+Szu3TARnTsA0GkOkQ==" }, "@webassemblyjs/ast": { "version": "1.9.0", @@ -7437,23 +7449,23 @@ } }, "@webpack-cli/configtest": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/@webpack-cli/configtest/-/configtest-1.0.4.tgz", - "integrity": "sha512-cs3XLy+UcxiP6bj0A6u7MLLuwdXJ1c3Dtc0RkKg+wiI1g/Ti1om8+/2hc2A2B60NbBNAbMgyBMHvyymWm/j4wQ==", + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@webpack-cli/configtest/-/configtest-1.1.0.tgz", + "integrity": "sha512-ttOkEkoalEHa7RaFYpM0ErK1xc4twg3Am9hfHhL7MVqlHebnkYd2wuI/ZqTDj0cVzZho6PdinY0phFZV3O0Mzg==", "requires": {} }, "@webpack-cli/info": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/@webpack-cli/info/-/info-1.3.0.tgz", - "integrity": "sha512-ASiVB3t9LOKHs5DyVUcxpraBXDOKubYu/ihHhU+t1UPpxsivg6Od2E2qU4gJCekfEddzRBzHhzA/Acyw/mlK/w==", + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/@webpack-cli/info/-/info-1.4.0.tgz", + "integrity": "sha512-F6b+Man0rwE4n0409FyAJHStYA5OIZERxmnUfLVwv0mc0V1wLad3V7jqRlMkgKBeAq07jUvglacNaa6g9lOpuw==", "requires": { "envinfo": "^7.7.3" } }, "@webpack-cli/serve": { - "version": "1.5.1", - "resolved": "https://registry.npmjs.org/@webpack-cli/serve/-/serve-1.5.1.tgz", - "integrity": "sha512-4vSVUiOPJLmr45S8rMGy7WDvpWxfFxfP/Qx/cxZFCfvoypTYpPPL1X8VIZMe0WTA+Jr7blUxwUSEZNkjoMTgSw==", + "version": "1.6.0", + "resolved": "https://registry.npmjs.org/@webpack-cli/serve/-/serve-1.6.0.tgz", + "integrity": "sha512-ZkVeqEmRpBV2GHvjjUZqEai2PpUbuq8Bqd//vEYsp63J8WyexI8ppCqVS3Zs0QADf6aWuPdU+0XsPI647PVlQA==", "requires": {} }, "@xtuc/ieee754": { @@ -8258,8 +8270,7 @@ "dayjs": { "version": "1.10.6", "resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.10.6.tgz", - "integrity": "sha512-AztC/IOW4L1Q41A86phW5Thhcrco3xuAA+YX/BLpLWWjRcTj5TOt/QImBLmCKlrF7u7k47arTnOyL6GnbG8Hvw==", - "dev": true + "integrity": "sha512-AztC/IOW4L1Q41A86phW5Thhcrco3xuAA+YX/BLpLWWjRcTj5TOt/QImBLmCKlrF7u7k47arTnOyL6GnbG8Hvw==" }, "debug": { "version": "4.3.1", @@ -8708,13 +8719,13 @@ } }, "flarum-tsconfig": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/flarum-tsconfig/-/flarum-tsconfig-1.0.0.tgz", - "integrity": "sha512-RknV9A3Mv2/PRLEzZAukH+zAN15z2vz7y0kHX5eCRBPXUDZo8TfGpO3gjFDIhbL9PCr/tnpkcvChK2SQjKxVMw==", - "dev": true, + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/flarum-tsconfig/-/flarum-tsconfig-1.0.2.tgz", + "integrity": "sha512-RUaN7D6noLK9vY1F86NIc+IlIP1YAA3bJ4jGR5pIm8UxvLBLW8qrAHzIosuQJgvnge7VgTA5c2LoNefUK/9EiQ==", "requires": { "@types/jquery": "^3.5.5", "@types/mithril": "^2.0.7", + "@types/throttle-debounce": "^2.1.0", "dayjs": "^1.10.4" } }, @@ -9714,6 +9725,12 @@ "resolved": "https://registry.npmjs.org/posix-character-classes/-/posix-character-classes-0.1.1.tgz", "integrity": "sha1-AerA/jta9xoqbAL+q7jB/vfgDqs=" }, + "prettier": { + "version": "2.5.1", + "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.5.1.tgz", + "integrity": "sha512-vBZcPRUR5MZJwoyi3ZoyQlc1rXeEck8KgeC9AwwOn+exuxLxq5toTRDTSaVrXHxelDMHy9zlicw8u66yxoSUFg==", + "dev": true + }, "process": { "version": "0.11.10", "resolved": "https://registry.npmjs.org/process/-/process-0.11.10.tgz", @@ -10686,11 +10703,6 @@ "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=" }, - "v8-compile-cache": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz", - "integrity": "sha512-l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA==" - }, "vm-browserify": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/vm-browserify/-/vm-browserify-1.1.2.tgz", @@ -10930,25 +10942,29 @@ } }, "webpack-cli": { - "version": "4.7.2", - "resolved": "https://registry.npmjs.org/webpack-cli/-/webpack-cli-4.7.2.tgz", - "integrity": "sha512-mEoLmnmOIZQNiRl0ebnjzQ74Hk0iKS5SiEEnpq3dRezoyR3yPaeQZCMCe+db4524pj1Pd5ghZXjT41KLzIhSLw==", + "version": "4.9.1", + "resolved": "https://registry.npmjs.org/webpack-cli/-/webpack-cli-4.9.1.tgz", + "integrity": "sha512-JYRFVuyFpzDxMDB+v/nanUdQYcZtqFPGzmlW4s+UkPMFhSpfRNmf1z4AwYcHJVdvEFAM7FFCQdNTpsBYhDLusQ==", "requires": { "@discoveryjs/json-ext": "^0.5.0", - "@webpack-cli/configtest": "^1.0.4", - "@webpack-cli/info": "^1.3.0", - "@webpack-cli/serve": "^1.5.1", - "colorette": "^1.2.1", + "@webpack-cli/configtest": "^1.1.0", + "@webpack-cli/info": "^1.4.0", + "@webpack-cli/serve": "^1.6.0", + "colorette": "^2.0.14", "commander": "^7.0.0", "execa": "^5.0.0", "fastest-levenshtein": "^1.0.12", "import-local": "^3.0.2", "interpret": "^2.2.0", "rechoir": "^0.7.0", - "v8-compile-cache": "^2.2.0", "webpack-merge": "^5.7.3" }, "dependencies": { + "colorette": { + "version": "2.0.16", + "resolved": "https://registry.npmjs.org/colorette/-/colorette-2.0.16.tgz", + "integrity": "sha512-hUewv7oMjCp+wkBv5Rm0v87eJhq4woh5rSR+42YSQJKecCqgIqNkZ6lAlQms/BwHPJA5NKMRlpxPRv0n8HQW6g==" + }, "commander": { "version": "7.2.0", "resolved": "https://registry.npmjs.org/commander/-/commander-7.2.0.tgz", diff --git a/extensions/mentions/js/package.json b/extensions/mentions/js/package.json index 6bbb5d3c7..43a3cd8a1 100644 --- a/extensions/mentions/js/package.json +++ b/extensions/mentions/js/package.json @@ -3,18 +3,19 @@ "name": "@flarum/mentions", "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.7.2" + "webpack-cli": "^4.9.1" + }, + "devDependencies": { + "prettier": "^2.5.1" }, "scripts": { "dev": "webpack --mode development --watch", "build": "webpack --mode production", - "format": "prettier --write src" - }, - "devDependencies": { - "@flarum/prettier-config": "^1.0.0", - "@types/mithril": "^2.0.8", - "flarum-tsconfig": "^1.0.0" + "format": "prettier --write src", + "format-check": "prettier --check src" } } diff --git a/extensions/mentions/js/src/admin/index.js b/extensions/mentions/js/src/admin/index.ts similarity index 91% rename from extensions/mentions/js/src/admin/index.js rename to extensions/mentions/js/src/admin/index.ts index 900b2b68a..e34d92cbc 100644 --- a/extensions/mentions/js/src/admin/index.js +++ b/extensions/mentions/js/src/admin/index.ts @@ -1,3 +1,5 @@ +import app from 'flarum/admin/app'; + app.initializers.add('flarum-mentions', function () { app.extensionData.for('flarum-mentions').registerSetting({ setting: 'flarum-mentions.allow_username_format', diff --git a/extensions/mentions/js/src/forum/addComposerAutocomplete.js b/extensions/mentions/js/src/forum/addComposerAutocomplete.js index 916c69f10..f1eec3122 100644 --- a/extensions/mentions/js/src/forum/addComposerAutocomplete.js +++ b/extensions/mentions/js/src/forum/addComposerAutocomplete.js @@ -1,3 +1,4 @@ +import app from 'flarum/forum/app'; import { extend } from 'flarum/common/extend'; import TextEditor from 'flarum/common/components/TextEditor'; import TextEditorButton from 'flarum/common/components/TextEditorButton'; diff --git a/extensions/mentions/js/src/forum/addMentionedByList.js b/extensions/mentions/js/src/forum/addMentionedByList.js index b988a79c0..63e02de01 100644 --- a/extensions/mentions/js/src/forum/addMentionedByList.js +++ b/extensions/mentions/js/src/forum/addMentionedByList.js @@ -1,3 +1,4 @@ +import app from 'flarum/forum/app'; import { extend } from 'flarum/common/extend'; import Model from 'flarum/common/Model'; import Post from 'flarum/common/models/Post'; diff --git a/extensions/mentions/js/src/forum/addPostQuoteButton.js b/extensions/mentions/js/src/forum/addPostQuoteButton.js index b3cd60620..b9a542395 100644 --- a/extensions/mentions/js/src/forum/addPostQuoteButton.js +++ b/extensions/mentions/js/src/forum/addPostQuoteButton.js @@ -1,5 +1,6 @@ -import { extend } from 'flarum/extend'; -import CommentPost from 'flarum/components/CommentPost'; +import app from 'flarum/forum/app'; +import { extend } from 'flarum/common/extend'; +import CommentPost from 'flarum/forum/components/CommentPost'; import PostQuoteButton from './fragments/PostQuoteButton'; import selectedText from './utils/selectedText'; diff --git a/extensions/mentions/js/src/forum/addPostReplyAction.js b/extensions/mentions/js/src/forum/addPostReplyAction.js index d676026b4..395d96def 100644 --- a/extensions/mentions/js/src/forum/addPostReplyAction.js +++ b/extensions/mentions/js/src/forum/addPostReplyAction.js @@ -1,6 +1,7 @@ -import { extend } from 'flarum/extend'; -import Button from 'flarum/components/Button'; -import CommentPost from 'flarum/components/CommentPost'; +import app from 'flarum/forum/app'; +import { extend } from 'flarum/common/extend'; +import Button from 'flarum/common/components/Button'; +import CommentPost from 'flarum/forum/components/CommentPost'; import reply from './utils/reply'; diff --git a/extensions/mentions/js/src/forum/components/MentionsUserPage.js b/extensions/mentions/js/src/forum/components/MentionsUserPage.js index 183d3d4d0..4ac4cec4c 100644 --- a/extensions/mentions/js/src/forum/components/MentionsUserPage.js +++ b/extensions/mentions/js/src/forum/components/MentionsUserPage.js @@ -1,4 +1,5 @@ -import PostsUserPage from 'flarum/components/PostsUserPage'; +import app from 'flarum/forum/app'; +import PostsUserPage from 'flarum/forum/components/PostsUserPage'; /** * The `MentionsUserPage` component shows post which user Mentioned at diff --git a/extensions/mentions/js/src/forum/components/PostMentionedNotification.js b/extensions/mentions/js/src/forum/components/PostMentionedNotification.js index d26cddf1e..42651aa1b 100644 --- a/extensions/mentions/js/src/forum/components/PostMentionedNotification.js +++ b/extensions/mentions/js/src/forum/components/PostMentionedNotification.js @@ -1,5 +1,6 @@ -import Notification from 'flarum/components/Notification'; -import { truncate } from 'flarum/utils/string'; +import app from 'flarum/forum/app'; +import Notification from 'flarum/forum/components/Notification'; +import { truncate } from 'flarum/common/utils/string'; export default class PostMentionedNotification extends Notification { icon() { diff --git a/extensions/mentions/js/src/forum/components/UserMentionedNotification.js b/extensions/mentions/js/src/forum/components/UserMentionedNotification.js index 7c9b02545..b108403a7 100644 --- a/extensions/mentions/js/src/forum/components/UserMentionedNotification.js +++ b/extensions/mentions/js/src/forum/components/UserMentionedNotification.js @@ -1,5 +1,6 @@ -import Notification from 'flarum/components/Notification'; -import { truncate } from 'flarum/utils/string'; +import app from 'flarum/forum/app'; +import Notification from 'flarum/forum/components/Notification'; +import { truncate } from 'flarum/common/utils/string'; export default class UserMentionedNotification extends Notification { icon() { diff --git a/extensions/mentions/js/src/forum/fragments/AutocompleteDropdown.js b/extensions/mentions/js/src/forum/fragments/AutocompleteDropdown.js index 6428929e9..7fd599a22 100644 --- a/extensions/mentions/js/src/forum/fragments/AutocompleteDropdown.js +++ b/extensions/mentions/js/src/forum/fragments/AutocompleteDropdown.js @@ -1,4 +1,4 @@ -import Fragment from 'flarum/Fragment'; +import Fragment from 'flarum/common/Fragment'; export default class AutocompleteDropdown extends Fragment { items = []; diff --git a/extensions/mentions/js/src/forum/fragments/PostQuoteButton.js b/extensions/mentions/js/src/forum/fragments/PostQuoteButton.js index 5771471d5..d8db0517c 100644 --- a/extensions/mentions/js/src/forum/fragments/PostQuoteButton.js +++ b/extensions/mentions/js/src/forum/fragments/PostQuoteButton.js @@ -1,5 +1,6 @@ -import Fragment from 'flarum/Fragment'; -import icon from 'flarum/helpers/icon'; +import app from 'flarum/forum/app'; +import Fragment from 'flarum/common/Fragment'; +import icon from 'flarum/common/helpers/icon'; import reply from '../utils/reply'; diff --git a/extensions/mentions/js/src/forum/index.js b/extensions/mentions/js/src/forum/index.js index fce3a9261..ab5392f46 100644 --- a/extensions/mentions/js/src/forum/index.js +++ b/extensions/mentions/js/src/forum/index.js @@ -1,7 +1,7 @@ -import { extend } from 'flarum/extend'; -import app from 'flarum/app'; -import NotificationGrid from 'flarum/components/NotificationGrid'; -import { getPlainContent } from 'flarum/utils/string'; +import { extend } from 'flarum/common/extend'; +import app from 'flarum/forum/app'; +import NotificationGrid from 'flarum/forum/components/NotificationGrid'; +import { getPlainContent } from 'flarum/common/utils/string'; import addPostMentionPreviews from './addPostMentionPreviews'; import addMentionedByList from './addMentionedByList'; @@ -10,8 +10,8 @@ import addPostQuoteButton from './addPostQuoteButton'; import addComposerAutocomplete from './addComposerAutocomplete'; import PostMentionedNotification from './components/PostMentionedNotification'; import UserMentionedNotification from './components/UserMentionedNotification'; -import UserPage from 'flarum/components/UserPage'; -import LinkButton from 'flarum/components/LinkButton'; +import UserPage from 'flarum/forum/components/UserPage'; +import LinkButton from 'flarum/common/components/LinkButton'; import MentionsUserPage from './components/MentionsUserPage'; app.initializers.add('flarum-mentions', function () { diff --git a/extensions/mentions/js/src/forum/utils/getCleanDisplayName.js b/extensions/mentions/js/src/forum/utils/getCleanDisplayName.js index 6165f72a2..d4b0ef331 100644 --- a/extensions/mentions/js/src/forum/utils/getCleanDisplayName.js +++ b/extensions/mentions/js/src/forum/utils/getCleanDisplayName.js @@ -1,3 +1,4 @@ +import app from 'flarum/forum/app'; import extractText from 'flarum/common/utils/extractText'; /** diff --git a/extensions/mentions/js/src/forum/utils/reply.js b/extensions/mentions/js/src/forum/utils/reply.js index b146a4141..3fdf7fec9 100644 --- a/extensions/mentions/js/src/forum/utils/reply.js +++ b/extensions/mentions/js/src/forum/utils/reply.js @@ -1,3 +1,4 @@ +import app from 'flarum/forum/app'; import DiscussionControls from 'flarum/forum/utils/DiscussionControls'; import EditPostComposer from 'flarum/forum/components/EditPostComposer'; import getMentionText from './getMentionText'; diff --git a/extensions/mentions/js/src/forum/utils/textFormatter.js b/extensions/mentions/js/src/forum/utils/textFormatter.js index f888a8f39..9c6c26c47 100644 --- a/extensions/mentions/js/src/forum/utils/textFormatter.js +++ b/extensions/mentions/js/src/forum/utils/textFormatter.js @@ -1,5 +1,6 @@ -import username from 'flarum/helpers/username'; -import extractText from 'flarum/utils/extractText'; +import app from 'flarum/forum/app'; +import username from 'flarum/common/helpers/username'; +import extractText from 'flarum/common/utils/extractText'; export function filterUserMentions(tag) { let user;