diff --git a/package.json b/package.json index 80bf64c7a..132425a08 100644 --- a/package.json +++ b/package.json @@ -188,7 +188,7 @@ "refractor": "^3.6.0", "request-filtering-agent": "^1.1.2", "semver": "^7.3.7", - "sequelize": "^6.20.1", + "sequelize": "^6.29.0", "sequelize-cli": "^6.4.1", "sequelize-encrypted": "^1.0.0", "sequelize-typescript": "^2.1.5", diff --git a/server/models/WebhookSubscription.ts b/server/models/WebhookSubscription.ts index 2d51db9f9..9d862a0eb 100644 --- a/server/models/WebhookSubscription.ts +++ b/server/models/WebhookSubscription.ts @@ -1,6 +1,7 @@ import crypto from "crypto"; import { bool } from "aws-sdk/clients/signer"; import { isEmpty } from "lodash"; +import { SaveOptions } from "sequelize"; import { Column, Table, @@ -13,7 +14,6 @@ import { DefaultScope, AllowNull, } from "sequelize-typescript"; -import { SaveOptions } from "sequelize/types"; import { WebhookSubscriptionValidation } from "@shared/validations"; import { ValidationError } from "@server/errors"; import { Event } from "@server/types"; diff --git a/server/routes/api/fileOperations.ts b/server/routes/api/fileOperations.ts index 3143d84bc..dc05073e0 100644 --- a/server/routes/api/fileOperations.ts +++ b/server/routes/api/fileOperations.ts @@ -1,5 +1,5 @@ import Router from "koa-router"; -import { WhereOptions } from "sequelize/types"; +import { WhereOptions } from "sequelize"; import { FileOperationType } from "@shared/types"; import fileOperationDeleter from "@server/commands/fileOperationDeleter"; import { ValidationError } from "@server/errors"; diff --git a/server/types.ts b/server/types.ts index 9b618745e..4c9965c47 100644 --- a/server/types.ts +++ b/server/types.ts @@ -1,6 +1,6 @@ import { ParameterizedContext, DefaultContext } from "koa"; import { IRouterParamContext } from "koa-router"; -import { Transaction } from "sequelize/types"; +import { Transaction } from "sequelize"; import { z } from "zod"; import { CollectionSort, diff --git a/yarn.lock b/yarn.lock index e1578ea20..ab4a9eb3b 100644 --- a/yarn.lock +++ b/yarn.lock @@ -9583,10 +9583,10 @@ moment-mini@^2.24.0: resolved "https://registry.yarnpkg.com/moment-mini/-/moment-mini-2.29.4.tgz#cbbcdc58ce1b267506f28ea6668dbe060a32758f" integrity sha512-uhXpYwHFeiTbY9KSgPPRoo1nt8OxNVdMVoTBYHfSEKeRkIkwGpO+gERmhuhBtzfaeOyTkykSrm2+noJBgqt3Hg== -moment-timezone@^0.5.34: - version "0.5.37" - resolved "https://registry.yarnpkg.com/moment-timezone/-/moment-timezone-0.5.37.tgz#adf97f719c4e458fdb12e2b4e87b8bec9f4eef1e" - integrity sha512-uEDzDNFhfaywRl+vwXxffjjq1q0Vzr+fcQpQ1bU0kbzorfS7zVtZnCnGc8mhWmF39d4g4YriF6kwA75mJKE/Zg== +moment-timezone@^0.5.35: + version "0.5.40" + resolved "https://registry.yarnpkg.com/moment-timezone/-/moment-timezone-0.5.40.tgz#c148f5149fd91dd3e29bf481abc8830ecba16b89" + integrity sha512-tWfmNkRYmBkPJz5mr9GVDn9vRlVZOTe6yqY92rFxiOdWXbjaR0+9LwQnZGGuNR63X456NqmEkbskte8tWL5ePg== dependencies: moment ">= 2.9.0" @@ -11457,10 +11457,10 @@ ret@~0.1.10: resolved "https://registry.yarnpkg.com/ret/-/ret-0.1.15.tgz#b8a4825d5bdb1fc3f6f53c2bc33f81388681c7bc" integrity sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg== -retry-as-promised@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/retry-as-promised/-/retry-as-promised-5.0.0.tgz#f4ecc25133603a2d2a7aff4a128691d7bc506d54" - integrity sha512-6S+5LvtTl2ggBumk04hBo/4Uf6fRJUwIgunGZ7CYEBCeufGFW1Pu6ucUf/UskHeWOIsUcLOGLFXPig5tR5V1nA== +retry-as-promised@^7.0.3: + version "7.0.4" + resolved "https://registry.yarnpkg.com/retry-as-promised/-/retry-as-promised-7.0.4.tgz#9df73adaeea08cb2948b9d34990549dc13d800a2" + integrity sha512-XgmCoxKWkDofwH8WddD0w85ZfqYz+ZHlr5yo+3YUCfycWawU56T5ckWXsScsj5B8tqUcIG67DxXByo3VUgiAdA== retry@^0.10.1: version "0.10.1" @@ -11700,10 +11700,10 @@ sequelize-typescript@^2.1.5: dependencies: glob "7.2.0" -sequelize@^6.20.1: - version "6.20.1" - resolved "https://registry.yarnpkg.com/sequelize/-/sequelize-6.20.1.tgz#1c796fa9134e46fefd9509e6e8ac947131b214ba" - integrity sha512-1YBMv++Yy1JBFFiac1Xoa+Km5qV6YI1ckdkW0xyD7IpLMtE5JmjgZdZXGfwgRUNjhaKMxdzT+nkvJgeXO0rv/g== +sequelize@^6.29.0: + version "6.29.0" + resolved "https://registry.yarnpkg.com/sequelize/-/sequelize-6.29.0.tgz#7b8750487adb7502ce8a7005b460d50c8ccc58b7" + integrity sha512-m8Wi90rs3NZP9coXE52c7PL4Q078nwYZXqt1IxPvgki7nOFn0p/F0eKsYDBXCPw9G8/BCEa6zZNk0DQUAT4ypA== dependencies: "@types/debug" "^4.1.7" "@types/validator" "^13.7.1" @@ -11712,9 +11712,9 @@ sequelize@^6.20.1: inflection "^1.13.2" lodash "^4.17.21" moment "^2.29.1" - moment-timezone "^0.5.34" + moment-timezone "^0.5.35" pg-connection-string "^2.5.0" - retry-as-promised "^5.0.0" + retry-as-promised "^7.0.3" semver "^7.3.5" sequelize-pool "^7.1.0" toposort-class "^1.0.1"