Update server dependencies
This commit is contained in:
parent
8f0b94f0ed
commit
c9f27d9881
5 changed files with 942 additions and 914 deletions
15
package.json
15
package.json
|
@ -78,7 +78,7 @@
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@aws-sdk/client-s3": "^3.23.0",
|
"@aws-sdk/client-s3": "^3.23.0",
|
||||||
"@babel/parser": "7.16.8",
|
"@babel/parser": "7.17.0",
|
||||||
"@peertube/feed": "^5.0.1",
|
"@peertube/feed": "^5.0.1",
|
||||||
"@peertube/http-signature": "^1.4.0",
|
"@peertube/http-signature": "^1.4.0",
|
||||||
"@uploadx/core": "^5.0.0",
|
"@uploadx/core": "^5.0.0",
|
||||||
|
@ -91,7 +91,7 @@
|
||||||
"bull": "^4.1.0",
|
"bull": "^4.1.0",
|
||||||
"bytes": "^3.0.0",
|
"bytes": "^3.0.0",
|
||||||
"chokidar": "^3.4.2",
|
"chokidar": "^3.4.2",
|
||||||
"commander": "^8.0.0",
|
"commander": "^9.0.0",
|
||||||
"config": "^3.0.0",
|
"config": "^3.0.0",
|
||||||
"cookie-parser": "^1.4.3",
|
"cookie-parser": "^1.4.3",
|
||||||
"cors": "^2.8.1",
|
"cors": "^2.8.1",
|
||||||
|
@ -117,7 +117,7 @@
|
||||||
"js-yaml": "^4.0.0",
|
"js-yaml": "^4.0.0",
|
||||||
"jsonld": "~5.2.0",
|
"jsonld": "~5.2.0",
|
||||||
"lodash": "^4.17.10",
|
"lodash": "^4.17.10",
|
||||||
"lru-cache": "^6.0.0",
|
"lru-cache": "^7.3.0",
|
||||||
"magnet-uri": "^6.1.0",
|
"magnet-uri": "^6.1.0",
|
||||||
"markdown-it": "^12.0.4",
|
"markdown-it": "^12.0.4",
|
||||||
"markdown-it-emoji": "^2.0.0",
|
"markdown-it-emoji": "^2.0.0",
|
||||||
|
@ -137,7 +137,7 @@
|
||||||
"redis": "^4.0.1",
|
"redis": "^4.0.1",
|
||||||
"reflect-metadata": "^0.1.12",
|
"reflect-metadata": "^0.1.12",
|
||||||
"sanitize-html": "2.x",
|
"sanitize-html": "2.x",
|
||||||
"sequelize": "6.13.0",
|
"sequelize": "6.16.1",
|
||||||
"sequelize-typescript": "^2.0.0-beta.1",
|
"sequelize-typescript": "^2.0.0-beta.1",
|
||||||
"short-uuid": "^4.2.0",
|
"short-uuid": "^4.2.0",
|
||||||
"sitemap": "^7.0.0",
|
"sitemap": "^7.0.0",
|
||||||
|
@ -150,7 +150,7 @@
|
||||||
"validator": "^13.0.0",
|
"validator": "^13.0.0",
|
||||||
"webfinger.js": "^2.6.6",
|
"webfinger.js": "^2.6.6",
|
||||||
"webtorrent": "^1.0.0",
|
"webtorrent": "^1.0.0",
|
||||||
"winston": "3.4.0",
|
"winston": "3.5.1",
|
||||||
"ws": "^8.0.0"
|
"ws": "^8.0.0"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
|
@ -208,13 +208,10 @@
|
||||||
"socket.io-client": "^4.0.1",
|
"socket.io-client": "^4.0.1",
|
||||||
"supertest": "^6.0.1",
|
"supertest": "^6.0.1",
|
||||||
"swagger-cli": "^4.0.2",
|
"swagger-cli": "^4.0.2",
|
||||||
"ts-node": "10.4.0",
|
"ts-node": "10.5.0",
|
||||||
"tsc-watch": "^4.6.0",
|
"tsc-watch": "^4.6.0",
|
||||||
"typescript": "^4.0.5"
|
"typescript": "^4.0.5"
|
||||||
},
|
},
|
||||||
"resolutions": {
|
|
||||||
"depcheck/@babel/parser": "7.16.4"
|
|
||||||
},
|
|
||||||
"bundlewatch": {
|
"bundlewatch": {
|
||||||
"files": [
|
"files": [
|
||||||
{
|
{
|
||||||
|
|
|
@ -623,7 +623,7 @@ export class UserModel extends Model<Partial<AttributesOnly<UserModel>>> {
|
||||||
const query = {
|
const query = {
|
||||||
where: {
|
where: {
|
||||||
[Op.or]: [
|
[Op.or]: [
|
||||||
where(fn('lower', col('username')), fn('lower', username)),
|
where(fn('lower', col('username')), '=', fn('lower', username)),
|
||||||
|
|
||||||
{ email }
|
{ email }
|
||||||
]
|
]
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
import { literal, Op, OrderItem, Sequelize } from 'sequelize'
|
import { literal, Op, OrderItem, Sequelize } from 'sequelize'
|
||||||
import { Col } from 'sequelize/types/lib/utils'
|
import { Col } from 'sequelize/types/utils'
|
||||||
import validator from 'validator'
|
import validator from 'validator'
|
||||||
|
|
||||||
type SortType = { sortModel: string, sortValue: string }
|
type SortType = { sortModel: string, sortValue: string }
|
||||||
|
|
|
@ -18,7 +18,7 @@ import {
|
||||||
Table,
|
Table,
|
||||||
UpdatedAt
|
UpdatedAt
|
||||||
} from 'sequelize-typescript'
|
} from 'sequelize-typescript'
|
||||||
import { Where } from 'sequelize/types/lib/utils'
|
import { Where } from 'sequelize/types/utils'
|
||||||
import validator from 'validator'
|
import validator from 'validator'
|
||||||
import { buildRemoteVideoBaseUrl } from '@server/helpers/activitypub'
|
import { buildRemoteVideoBaseUrl } from '@server/helpers/activitypub'
|
||||||
import { logger } from '@server/helpers/logger'
|
import { logger } from '@server/helpers/logger'
|
||||||
|
|
Loading…
Reference in a new issue