diff --git a/package-lock.json b/package-lock.json index 2c3335d3..3b9d0534 100644 --- a/package-lock.json +++ b/package-lock.json @@ -42,7 +42,7 @@ "@types/jsonwebtoken": "^8.5.0", "@types/morgan": "^1.9.2", "@types/nedb": "^1.8.11", - "@types/node": "^12.19.8", + "@types/node": "^12.19.9", "@types/overlayscrollbars": "^1.12.0", "@types/passport": "^1.0.4", "@types/passport-jwt": "^3.0.3", @@ -97,7 +97,7 @@ "express-rate-limit": "^5.2.3", "fast-json-patch": "^3.0.0-1", "fast-sort": "^2.2.0", - "feedsub": "^0.7.5", + "feedsub": "^0.7.6", "file-loader": "^6.2.0", "form-data": "^3.0.0", "frontmatter-markdown-loader": "^3.6.2", @@ -151,7 +151,6 @@ "supertest": "^6.0.1", "tar": "^6.0.5", "terser-webpack-plugin": "^5.0.3", - "tiny-typed-emitter": "^2.0.3", "ts-jest": "^26.4.4", "ts-node-dev": "^1.1.1", "typed-emitter": "^1.3.1", @@ -3059,9 +3058,9 @@ } }, "node_modules/@types/node": { - "version": "12.19.8", - "resolved": "https://registry.npmjs.org/@types/node/-/node-12.19.8.tgz", - "integrity": "sha512-D4k2kNi0URNBxIRCb1khTnkWNHv8KSL1owPmS/K5e5t8B2GzMReY7AsJIY1BnP5KdlgC4rj9jk2IkDMasIE7xg==", + "version": "12.19.9", + "resolved": "https://registry.npmjs.org/@types/node/-/node-12.19.9.tgz", + "integrity": "sha512-yj0DOaQeUrk3nJ0bd3Y5PeDRJ6W0r+kilosLA+dzF3dola/o9hxhMSg2sFvVcA2UHS5JSOsZp4S0c1OEXc4m1Q==", "dev": true }, "node_modules/@types/normalize-package-data": { @@ -9132,15 +9131,15 @@ } }, "node_modules/feedsub": { - "version": "0.7.5", - "resolved": "https://registry.npmjs.org/feedsub/-/feedsub-0.7.5.tgz", - "integrity": "sha512-AymSNNRsPTjCifSmhaPQzbEq+4NFJjnprpTKOQVxeMmKfWHZDk2u9t7/ZvwZdTXDNk5jOUHLR7smYSf6YMh4yg==", + "version": "0.7.6", + "resolved": "https://registry.npmjs.org/feedsub/-/feedsub-0.7.6.tgz", + "integrity": "sha512-6M8XMKPePkntE+ZRrnY/U/JVV7BLUuNHiSUfnTu8ArLWWi+CuRsqF5g4TbEruJLJLvt3Fkgj/o14o66xHMTT7g==", "dev": true, - "license": "MIT", "dependencies": { "feedme": "^2.0.2", "miniget": "^4.0.0", - "newsemitter": "^1.0.2" + "newsemitter": "^1.0.2", + "tiny-typed-emitter": "^2.0.3" }, "engines": { "node": ">=10" @@ -28026,9 +28025,9 @@ } }, "@types/node": { - "version": "12.19.8", - "resolved": "https://registry.npmjs.org/@types/node/-/node-12.19.8.tgz", - "integrity": "sha512-D4k2kNi0URNBxIRCb1khTnkWNHv8KSL1owPmS/K5e5t8B2GzMReY7AsJIY1BnP5KdlgC4rj9jk2IkDMasIE7xg==", + "version": "12.19.9", + "resolved": "https://registry.npmjs.org/@types/node/-/node-12.19.9.tgz", + "integrity": "sha512-yj0DOaQeUrk3nJ0bd3Y5PeDRJ6W0r+kilosLA+dzF3dola/o9hxhMSg2sFvVcA2UHS5JSOsZp4S0c1OEXc4m1Q==", "dev": true }, "@types/normalize-package-data": { @@ -32952,14 +32951,15 @@ } }, "feedsub": { - "version": "0.7.5", - "resolved": "https://registry.npmjs.org/feedsub/-/feedsub-0.7.5.tgz", - "integrity": "sha512-AymSNNRsPTjCifSmhaPQzbEq+4NFJjnprpTKOQVxeMmKfWHZDk2u9t7/ZvwZdTXDNk5jOUHLR7smYSf6YMh4yg==", + "version": "0.7.6", + "resolved": "https://registry.npmjs.org/feedsub/-/feedsub-0.7.6.tgz", + "integrity": "sha512-6M8XMKPePkntE+ZRrnY/U/JVV7BLUuNHiSUfnTu8ArLWWi+CuRsqF5g4TbEruJLJLvt3Fkgj/o14o66xHMTT7g==", "dev": true, "requires": { "feedme": "^2.0.2", "miniget": "^4.0.0", - "newsemitter": "^1.0.2" + "newsemitter": "^1.0.2", + "tiny-typed-emitter": "^2.0.3" } }, "figures": { diff --git a/package.json b/package.json index 37815573..51d58491 100644 --- a/package.json +++ b/package.json @@ -91,7 +91,7 @@ "@types/jsonwebtoken": "^8.5.0", "@types/morgan": "^1.9.2", "@types/nedb": "^1.8.11", - "@types/node": "^12.19.8", + "@types/node": "^12.19.9", "@types/overlayscrollbars": "^1.12.0", "@types/passport": "^1.0.4", "@types/passport-jwt": "^3.0.3", @@ -146,7 +146,7 @@ "express-rate-limit": "^5.2.3", "fast-json-patch": "^3.0.0-1", "fast-sort": "^2.2.0", - "feedsub": "^0.7.5", + "feedsub": "^0.7.6", "file-loader": "^6.2.0", "form-data": "^3.0.0", "frontmatter-markdown-loader": "^3.6.2", @@ -200,7 +200,6 @@ "supertest": "^6.0.1", "tar": "^6.0.5", "terser-webpack-plugin": "^5.0.3", - "tiny-typed-emitter": "^2.0.3", "ts-jest": "^26.4.4", "ts-node-dev": "^1.1.1", "typed-emitter": "^1.3.1", diff --git a/server/models/FeedReader.ts b/server/models/FeedReader.ts index c6f176ad..ffacecb0 100644 --- a/server/models/FeedReader.ts +++ b/server/models/FeedReader.ts @@ -1,6 +1,4 @@ -import FeedSub from 'feedsub'; - -import type {FeedItem} from 'feedme'; +import FeedSub, {FeedItem} from 'feedsub'; export interface FeedReaderOptions { feedID: string; diff --git a/server/services/feedService.ts b/server/services/feedService.ts index 5cfde389..42564f00 100644 --- a/server/services/feedService.ts +++ b/server/services/feedService.ts @@ -1,7 +1,7 @@ import path from 'path'; import Datastore from 'nedb'; -import type {FeedItem} from 'feedme'; +import type {FeedItem} from 'feedsub'; import BaseService from './BaseService'; import config from '../../config'; diff --git a/server/util/feedUtil.ts b/server/util/feedUtil.ts index a654b029..ee9854f7 100644 --- a/server/util/feedUtil.ts +++ b/server/util/feedUtil.ts @@ -1,4 +1,4 @@ -import type {FeedItem} from 'feedme'; +import type {FeedItem} from 'feedsub'; import regEx from '../../shared/util/regEx';