mirror of
https://github.com/LemmyNet/lemmy-ui.git
synced 2024-12-01 16:51:13 +00:00
Merge branch 'main' into fix_links
This commit is contained in:
commit
08f53707a8
11 changed files with 953 additions and 700 deletions
66
package.json
66
package.json
|
@ -30,11 +30,11 @@
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@babel/plugin-proposal-decorators": "^7.21.0",
|
"@babel/plugin-proposal-decorators": "^7.21.0",
|
||||||
"@babel/plugin-transform-runtime": "^7.21.0",
|
"@babel/plugin-transform-runtime": "^7.21.4",
|
||||||
"@babel/plugin-transform-typescript": "^7.21.0",
|
"@babel/plugin-transform-typescript": "^7.21.3",
|
||||||
"@babel/preset-env": "7.20.2",
|
"@babel/preset-env": "7.21.5",
|
||||||
"@babel/preset-typescript": "^7.21.0",
|
"@babel/preset-typescript": "^7.21.5",
|
||||||
"@babel/runtime": "^7.21.0",
|
"@babel/runtime": "^7.21.5",
|
||||||
"@emoji-mart/data": "^1.1.0",
|
"@emoji-mart/data": "^1.1.0",
|
||||||
"autosize": "^6.0.1",
|
"autosize": "^6.0.1",
|
||||||
"babel-loader": "^9.1.2",
|
"babel-loader": "^9.1.2",
|
||||||
|
@ -48,15 +48,15 @@
|
||||||
"emoji-mart": "^5.4.0",
|
"emoji-mart": "^5.4.0",
|
||||||
"emoji-short-name": "^2.0.0",
|
"emoji-short-name": "^2.0.0",
|
||||||
"express": "~4.18.2",
|
"express": "~4.18.2",
|
||||||
"html-to-text": "^9.0.4",
|
"html-to-text": "^9.0.5",
|
||||||
"i18next": "^22.4.10",
|
"i18next": "^22.4.15",
|
||||||
"inferno": "^8.0.6",
|
"inferno": "^8.1.1",
|
||||||
"inferno-create-element": "^8.0.6",
|
"inferno-create-element": "^8.1.1",
|
||||||
"inferno-helmet": "^5.2.1",
|
"inferno-helmet": "^5.2.1",
|
||||||
"inferno-hydrate": "^8.0.6",
|
"inferno-hydrate": "^8.1.1",
|
||||||
"inferno-i18next-dess": "0.0.2",
|
"inferno-i18next-dess": "0.0.2",
|
||||||
"inferno-router": "^8.0.6",
|
"inferno-router": "^8.1.1",
|
||||||
"inferno-server": "^8.0.6",
|
"inferno-server": "^8.1.1",
|
||||||
"isomorphic-cookie": "^1.2.4",
|
"isomorphic-cookie": "^1.2.4",
|
||||||
"jwt-decode": "^3.1.2",
|
"jwt-decode": "^3.1.2",
|
||||||
"lemmy-js-client": "0.17.2-rc.5",
|
"lemmy-js-client": "0.17.2-rc.5",
|
||||||
|
@ -67,53 +67,53 @@
|
||||||
"markdown-it-html5-embed": "^1.0.0",
|
"markdown-it-html5-embed": "^1.0.0",
|
||||||
"markdown-it-sub": "^1.0.0",
|
"markdown-it-sub": "^1.0.0",
|
||||||
"markdown-it-sup": "^1.0.0",
|
"markdown-it-sup": "^1.0.0",
|
||||||
"mini-css-extract-plugin": "^2.7.2",
|
"mini-css-extract-plugin": "^2.7.5",
|
||||||
"moment": "^2.29.4",
|
"moment": "^2.29.4",
|
||||||
"register-service-worker": "^1.7.2",
|
"register-service-worker": "^1.7.2",
|
||||||
"run-node-webpack-plugin": "^1.3.0",
|
"run-node-webpack-plugin": "^1.3.0",
|
||||||
"rxjs": "^7.8.0",
|
"rxjs": "^7.8.1",
|
||||||
"sanitize-html": "^2.10.0",
|
"sanitize-html": "^2.10.0",
|
||||||
"sass": "^1.58.3",
|
"sass": "^1.62.1",
|
||||||
"sass-loader": "^13.2.0",
|
"sass-loader": "^13.2.2",
|
||||||
"serialize-javascript": "^6.0.1",
|
"serialize-javascript": "^6.0.1",
|
||||||
"tippy.js": "^6.3.7",
|
"tippy.js": "^6.3.7",
|
||||||
"toastify-js": "^1.12.0",
|
"toastify-js": "^1.12.0",
|
||||||
"tributejs": "^5.1.3",
|
"tributejs": "^5.1.3",
|
||||||
"webpack": "5.75.0",
|
"webpack": "5.82.1",
|
||||||
"webpack-cli": "^5.0.1",
|
"webpack-cli": "^5.1.1",
|
||||||
"webpack-node-externals": "^3.0.0",
|
"webpack-node-externals": "^3.0.0",
|
||||||
"websocket-ts": "^1.1.1"
|
"websocket-ts": "^1.1.1"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@babel/core": "^7.21.0",
|
"@babel/core": "^7.21.8",
|
||||||
"@types/autosize": "^4.0.0",
|
"@types/autosize": "^4.0.0",
|
||||||
"@types/express": "^4.17.17",
|
"@types/express": "^4.17.17",
|
||||||
"@types/html-to-text": "^9.0.0",
|
"@types/html-to-text": "^9.0.0",
|
||||||
"@types/markdown-it": "^12.2.3",
|
"@types/markdown-it": "^12.2.3",
|
||||||
"@types/markdown-it-container": "^2.0.5",
|
"@types/markdown-it-container": "^2.0.5",
|
||||||
"@types/node": "^18.14.0",
|
"@types/node": "^20.1.2",
|
||||||
"@types/sanitize-html": "^2.8.0",
|
"@types/sanitize-html": "^2.9.0",
|
||||||
"@types/serialize-javascript": "^5.0.1",
|
"@types/serialize-javascript": "^5.0.1",
|
||||||
"@types/toastify-js": "^1.11.1",
|
"@types/toastify-js": "^1.11.1",
|
||||||
"@typescript-eslint/eslint-plugin": "^5.53.0",
|
"@typescript-eslint/eslint-plugin": "^5.59.5",
|
||||||
"@typescript-eslint/parser": "^5.53.0",
|
"@typescript-eslint/parser": "^5.59.5",
|
||||||
"bootswatch": "^5.2.3",
|
"bootswatch": "^5.2.3",
|
||||||
"eslint": "^8.34.0",
|
"eslint": "^8.40.0",
|
||||||
"eslint-plugin-inferno": "^7.32.1",
|
"eslint-plugin-inferno": "^7.32.2",
|
||||||
"eslint-plugin-prettier": "^4.2.1",
|
"eslint-plugin-prettier": "^4.2.1",
|
||||||
"husky": "^8.0.3",
|
"husky": "^8.0.3",
|
||||||
"import-sort-style-module": "^6.0.0",
|
"import-sort-style-module": "^6.0.0",
|
||||||
"lint-staged": "^13.1.2",
|
"lint-staged": "^13.2.2",
|
||||||
"prettier": "^2.8.4",
|
"prettier": "^2.8.8",
|
||||||
"prettier-plugin-import-sort": "^0.0.7",
|
"prettier-plugin-import-sort": "^0.0.7",
|
||||||
"prettier-plugin-organize-imports": "^3.2.2",
|
"prettier-plugin-organize-imports": "^3.2.2",
|
||||||
"prettier-plugin-packagejson": "^2.4.3",
|
"prettier-plugin-packagejson": "^2.4.3",
|
||||||
"rimraf": "^4.1.2",
|
"rimraf": "^5.0.0",
|
||||||
"sortpack": "^2.3.3",
|
"sortpack": "^2.3.4",
|
||||||
"style-loader": "^3.3.1",
|
"style-loader": "^3.3.2",
|
||||||
"terser": "^5.16.4",
|
"terser": "^5.17.3",
|
||||||
"typescript": "^4.9.5",
|
"typescript": "^5.0.4",
|
||||||
"webpack-dev-server": "4.11.1"
|
"webpack-dev-server": "4.15.0"
|
||||||
},
|
},
|
||||||
"engines": {
|
"engines": {
|
||||||
"node": ">=8.9.0"
|
"node": ">=8.9.0"
|
||||||
|
|
|
@ -17,13 +17,13 @@ import { InitialFetchRequest } from "shared/interfaces";
|
||||||
import { i18n } from "../../i18next";
|
import { i18n } from "../../i18next";
|
||||||
import { WebSocketService } from "../../services";
|
import { WebSocketService } from "../../services";
|
||||||
import {
|
import {
|
||||||
|
QueryParams,
|
||||||
getPageFromString,
|
getPageFromString,
|
||||||
getQueryParams,
|
getQueryParams,
|
||||||
getQueryString,
|
getQueryString,
|
||||||
isBrowser,
|
isBrowser,
|
||||||
myAuth,
|
myAuth,
|
||||||
numToSI,
|
numToSI,
|
||||||
QueryParams,
|
|
||||||
routeListingTypeToEnum,
|
routeListingTypeToEnum,
|
||||||
setIsoData,
|
setIsoData,
|
||||||
showLocal,
|
showLocal,
|
||||||
|
|
|
@ -33,6 +33,7 @@ import {
|
||||||
} from "../../interfaces";
|
} from "../../interfaces";
|
||||||
import { UserService, WebSocketService } from "../../services";
|
import { UserService, WebSocketService } from "../../services";
|
||||||
import {
|
import {
|
||||||
|
QueryParams,
|
||||||
commentsToFlatNodes,
|
commentsToFlatNodes,
|
||||||
communityRSSUrl,
|
communityRSSUrl,
|
||||||
createCommentLikeRes,
|
createCommentLikeRes,
|
||||||
|
@ -51,7 +52,6 @@ import {
|
||||||
notifyPost,
|
notifyPost,
|
||||||
nsfwCheck,
|
nsfwCheck,
|
||||||
postToCommentSortType,
|
postToCommentSortType,
|
||||||
QueryParams,
|
|
||||||
relTags,
|
relTags,
|
||||||
restoreScrollPosition,
|
restoreScrollPosition,
|
||||||
routeDataTypeToEnum,
|
routeDataTypeToEnum,
|
||||||
|
|
|
@ -21,11 +21,11 @@ import {
|
||||||
ModBanView,
|
ModBanView,
|
||||||
ModFeaturePostView,
|
ModFeaturePostView,
|
||||||
ModLockPostView,
|
ModLockPostView,
|
||||||
ModlogActionType,
|
|
||||||
ModRemoveCommentView,
|
ModRemoveCommentView,
|
||||||
ModRemoveCommunityView,
|
ModRemoveCommunityView,
|
||||||
ModRemovePostView,
|
ModRemovePostView,
|
||||||
ModTransferCommunityView,
|
ModTransferCommunityView,
|
||||||
|
ModlogActionType,
|
||||||
PersonSafe,
|
PersonSafe,
|
||||||
UserOperation,
|
UserOperation,
|
||||||
wsJsonToRes,
|
wsJsonToRes,
|
||||||
|
@ -37,9 +37,10 @@ import { i18n } from "../i18next";
|
||||||
import { InitialFetchRequest } from "../interfaces";
|
import { InitialFetchRequest } from "../interfaces";
|
||||||
import { WebSocketService } from "../services";
|
import { WebSocketService } from "../services";
|
||||||
import {
|
import {
|
||||||
|
Choice,
|
||||||
|
QueryParams,
|
||||||
amAdmin,
|
amAdmin,
|
||||||
amMod,
|
amMod,
|
||||||
Choice,
|
|
||||||
debounce,
|
debounce,
|
||||||
fetchLimit,
|
fetchLimit,
|
||||||
fetchUsers,
|
fetchUsers,
|
||||||
|
@ -51,7 +52,6 @@ import {
|
||||||
isBrowser,
|
isBrowser,
|
||||||
myAuth,
|
myAuth,
|
||||||
personToChoice,
|
personToChoice,
|
||||||
QueryParams,
|
|
||||||
setIsoData,
|
setIsoData,
|
||||||
toast,
|
toast,
|
||||||
wsClient,
|
wsClient,
|
||||||
|
|
|
@ -18,8 +18,8 @@ import {
|
||||||
PostReportResponse,
|
PostReportResponse,
|
||||||
PrivateMessageReportResponse,
|
PrivateMessageReportResponse,
|
||||||
PrivateMessageResponse,
|
PrivateMessageResponse,
|
||||||
PrivateMessagesResponse,
|
|
||||||
PrivateMessageView,
|
PrivateMessageView,
|
||||||
|
PrivateMessagesResponse,
|
||||||
UserOperation,
|
UserOperation,
|
||||||
wsJsonToRes,
|
wsJsonToRes,
|
||||||
wsUserOp,
|
wsUserOp,
|
||||||
|
|
|
@ -28,6 +28,7 @@ import { i18n } from "../../i18next";
|
||||||
import { InitialFetchRequest, PersonDetailsView } from "../../interfaces";
|
import { InitialFetchRequest, PersonDetailsView } from "../../interfaces";
|
||||||
import { UserService, WebSocketService } from "../../services";
|
import { UserService, WebSocketService } from "../../services";
|
||||||
import {
|
import {
|
||||||
|
QueryParams,
|
||||||
canMod,
|
canMod,
|
||||||
capitalizeFirstLetter,
|
capitalizeFirstLetter,
|
||||||
createCommentLikeRes,
|
createCommentLikeRes,
|
||||||
|
@ -46,7 +47,6 @@ import {
|
||||||
mdToHtml,
|
mdToHtml,
|
||||||
myAuth,
|
myAuth,
|
||||||
numToSI,
|
numToSI,
|
||||||
QueryParams,
|
|
||||||
relTags,
|
relTags,
|
||||||
restoreScrollPosition,
|
restoreScrollPosition,
|
||||||
routeSortTypeToEnum,
|
routeSortTypeToEnum,
|
||||||
|
|
|
@ -22,8 +22,8 @@ import { Subscription } from "rxjs";
|
||||||
import { i18n, languages } from "../../i18next";
|
import { i18n, languages } from "../../i18next";
|
||||||
import { UserService, WebSocketService } from "../../services";
|
import { UserService, WebSocketService } from "../../services";
|
||||||
import {
|
import {
|
||||||
capitalizeFirstLetter,
|
|
||||||
Choice,
|
Choice,
|
||||||
|
capitalizeFirstLetter,
|
||||||
communityToChoice,
|
communityToChoice,
|
||||||
debounce,
|
debounce,
|
||||||
elementUrl,
|
elementUrl,
|
||||||
|
|
|
@ -16,6 +16,7 @@ import { i18n } from "../../i18next";
|
||||||
import { UserService, WebSocketService } from "../../services";
|
import { UserService, WebSocketService } from "../../services";
|
||||||
import {
|
import {
|
||||||
Choice,
|
Choice,
|
||||||
|
QueryParams,
|
||||||
enableDownvotes,
|
enableDownvotes,
|
||||||
enableNsfw,
|
enableNsfw,
|
||||||
getIdFromString,
|
getIdFromString,
|
||||||
|
@ -23,7 +24,6 @@ import {
|
||||||
getQueryString,
|
getQueryString,
|
||||||
isBrowser,
|
isBrowser,
|
||||||
myAuth,
|
myAuth,
|
||||||
QueryParams,
|
|
||||||
setIsoData,
|
setIsoData,
|
||||||
toast,
|
toast,
|
||||||
wsClient,
|
wsClient,
|
||||||
|
|
|
@ -21,9 +21,9 @@ import { i18n } from "../../i18next";
|
||||||
import { PostFormParams } from "../../interfaces";
|
import { PostFormParams } from "../../interfaces";
|
||||||
import { UserService, WebSocketService } from "../../services";
|
import { UserService, WebSocketService } from "../../services";
|
||||||
import {
|
import {
|
||||||
|
Choice,
|
||||||
archiveTodayUrl,
|
archiveTodayUrl,
|
||||||
capitalizeFirstLetter,
|
capitalizeFirstLetter,
|
||||||
Choice,
|
|
||||||
communityToChoice,
|
communityToChoice,
|
||||||
debounce,
|
debounce,
|
||||||
fetchCommunities,
|
fetchCommunities,
|
||||||
|
|
|
@ -30,8 +30,9 @@ import { i18n } from "../i18next";
|
||||||
import { CommentViewType, InitialFetchRequest } from "../interfaces";
|
import { CommentViewType, InitialFetchRequest } from "../interfaces";
|
||||||
import { WebSocketService } from "../services";
|
import { WebSocketService } from "../services";
|
||||||
import {
|
import {
|
||||||
capitalizeFirstLetter,
|
|
||||||
Choice,
|
Choice,
|
||||||
|
QueryParams,
|
||||||
|
capitalizeFirstLetter,
|
||||||
commentsToFlatNodes,
|
commentsToFlatNodes,
|
||||||
communityToChoice,
|
communityToChoice,
|
||||||
createCommentLikeRes,
|
createCommentLikeRes,
|
||||||
|
@ -50,7 +51,6 @@ import {
|
||||||
myAuth,
|
myAuth,
|
||||||
numToSI,
|
numToSI,
|
||||||
personToChoice,
|
personToChoice,
|
||||||
QueryParams,
|
|
||||||
restoreScrollPosition,
|
restoreScrollPosition,
|
||||||
routeListingTypeToEnum,
|
routeListingTypeToEnum,
|
||||||
routeSearchTypeToEnum,
|
routeSearchTypeToEnum,
|
||||||
|
@ -220,7 +220,7 @@ const personListing = ({ person, counts: { comment_count } }: PersonViewSafe) =>
|
||||||
);
|
);
|
||||||
|
|
||||||
const getListing = (
|
const getListing = (
|
||||||
listing: JSX.Element,
|
listing: JSX.ElementClass,
|
||||||
count: number,
|
count: number,
|
||||||
translationKey: "number_of_comments" | "number_of_subscribers"
|
translationKey: "number_of_comments" | "number_of_subscribers"
|
||||||
) => (
|
) => (
|
||||||
|
|
Loading…
Reference in a new issue