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