From 3be1f8230523b3bc33fe3d8159a7b3d30bbe056b Mon Sep 17 00:00:00 2001 From: Stephen Eisenhauer Date: Sat, 1 Jun 2024 18:00:52 -0700 Subject: [PATCH] Update dependencies --- .nvmrc | 2 +- .pnp.cjs | 240 +++++++++++++++++++++------------------------------ Dockerfile | 4 +- README.md | 2 +- dist/epub.js | 9 +- package.json | 12 +-- src/epub.ts | 10 ++- yarn.lock | 193 +++++++++++++++++------------------------ 8 files changed, 203 insertions(+), 269 deletions(-) diff --git a/.nvmrc b/.nvmrc index 8c60e1e..7bceec7 100644 --- a/.nvmrc +++ b/.nvmrc @@ -1 +1 @@ -v20.5.1 +v22.2.0 diff --git a/.pnp.cjs b/.pnp.cjs index b03d876..2d90b59 100755 --- a/.pnp.cjs +++ b/.pnp.cjs @@ -31,33 +31,21 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["@folder/xdg", "npm:4.0.1"],\ ["@mozilla/readability", "npm:0.5.0"],\ ["@types/express", "npm:4.17.21"],\ - ["@types/jsdom", "npm:21.1.6"],\ - ["@types/node", "npm:20.11.0"],\ + ["@types/jsdom", "npm:21.1.7"],\ + ["@types/node", "npm:20.13.0"],\ ["concurrently", "npm:8.2.2"],\ ["epub-gen", "npm:0.1.0"],\ - ["express", "npm:4.18.2"],\ + ["express", "npm:4.19.2"],\ ["feed", "npm:4.2.2"],\ ["got", "npm:12.6.1"],\ - ["jsdom", "virtual:1c70d8e181737d5ab39c4d8abcf877d4935835cff8dbf876c1e1cec646046c8ec891c0654f862bb1538b798be313c6cdee86426894f1f831e3428f7823990ff4#npm:23.2.0"],\ - ["nodemon", "npm:3.0.2"],\ + ["jsdom", "virtual:1c70d8e181737d5ab39c4d8abcf877d4935835cff8dbf876c1e1cec646046c8ec891c0654f862bb1538b798be313c6cdee86426894f1f831e3428f7823990ff4#npm:24.1.0"],\ + ["nodemon", "npm:3.1.2"],\ ["typescript", "patch:typescript@npm%3A5.3.3#~builtin::version=5.3.3&hash=14eedb"],\ ["xmlbuilder2", "npm:3.1.1"]\ ],\ "linkType": "SOFT"\ }]\ ]],\ - ["@asamuzakjp/dom-selector", [\ - ["npm:2.0.2", {\ - "packageLocation": "./.yarn/cache/@asamuzakjp-dom-selector-npm-2.0.2-9ddb736627-a454537fcb.zip/node_modules/@asamuzakjp/dom-selector/",\ - "packageDependencies": [\ - ["@asamuzakjp/dom-selector", "npm:2.0.2"],\ - ["bidi-js", "npm:1.0.3"],\ - ["css-tree", "npm:2.3.1"],\ - ["is-potential-custom-element-name", "npm:1.0.1"]\ - ],\ - "linkType": "HARD"\ - }]\ - ]],\ ["@babel/runtime", [\ ["npm:7.22.6", {\ "packageLocation": "./.yarn/cache/@babel-runtime-npm-7.22.6-493f6b7ad0-e585338287.zip/node_modules/@babel/runtime/",\ @@ -270,10 +258,10 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { }]\ ]],\ ["@types/jsdom", [\ - ["npm:21.1.6", {\ - "packageLocation": "./.yarn/cache/@types-jsdom-npm-21.1.6-29114a659c-d6fbaab306.zip/node_modules/@types/jsdom/",\ + ["npm:21.1.7", {\ + "packageLocation": "./.yarn/cache/@types-jsdom-npm-21.1.7-b9d35cbe67-b7465d5a47.zip/node_modules/@types/jsdom/",\ "packageDependencies": [\ - ["@types/jsdom", "npm:21.1.6"],\ + ["@types/jsdom", "npm:21.1.7"],\ ["@types/node", "npm:20.4.5"],\ ["@types/tough-cookie", "npm:4.0.2"],\ ["parse5", "npm:7.1.2"]\ @@ -298,10 +286,10 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { }]\ ]],\ ["@types/node", [\ - ["npm:20.11.0", {\ - "packageLocation": "./.yarn/cache/@types-node-npm-20.11.0-cb757f0c2a-1bd6890db7.zip/node_modules/@types/node/",\ + ["npm:20.13.0", {\ + "packageLocation": "./.yarn/cache/@types-node-npm-20.13.0-88c0bd0276-8e061ecd66.zip/node_modules/@types/node/",\ "packageDependencies": [\ - ["@types/node", "npm:20.11.0"],\ + ["@types/node", "npm:20.13.0"],\ ["undici-types", "npm:5.26.5"]\ ],\ "linkType": "HARD"\ @@ -590,16 +578,6 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { "linkType": "HARD"\ }]\ ]],\ - ["bidi-js", [\ - ["npm:1.0.3", {\ - "packageLocation": "./.yarn/cache/bidi-js-npm-1.0.3-0035393a88-877c5dcfd6.zip/node_modules/bidi-js/",\ - "packageDependencies": [\ - ["bidi-js", "npm:1.0.3"],\ - ["require-from-string", "npm:2.0.2"]\ - ],\ - "linkType": "HARD"\ - }]\ - ]],\ ["binary-extensions", [\ ["npm:2.2.0", {\ "packageLocation": "./.yarn/cache/binary-extensions-npm-2.2.0-180c33fec7-ccd267956c.zip/node_modules/binary-extensions/",\ @@ -622,20 +600,20 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { }]\ ]],\ ["body-parser", [\ - ["npm:1.20.1", {\ - "packageLocation": "./.yarn/cache/body-parser-npm-1.20.1-759fd14db9-f1050dbac3.zip/node_modules/body-parser/",\ + ["npm:1.20.2", {\ + "packageLocation": "./.yarn/cache/body-parser-npm-1.20.2-44738662cf-14d37ec638.zip/node_modules/body-parser/",\ "packageDependencies": [\ - ["body-parser", "npm:1.20.1"],\ + ["body-parser", "npm:1.20.2"],\ ["bytes", "npm:3.1.2"],\ ["content-type", "npm:1.0.5"],\ - ["debug", "virtual:759fd14db92b54abdb7afb3d21dbf8d50f1a5c59c96cd3f963ce3e3ed063bdb801142fae5f01cc81fb79f7ddc13b7c31a9deb9d5a9cfa48ec107f83de8f7f40e#npm:2.6.9"],\ + ["debug", "virtual:44738662cf800ff2863ba9baeabb817b24a959a14f86e20a31680e5dc79a4a738f7ceb7dca32753d579fae475aa061dffad8228a3391f3a9546b122f077e29a5#npm:2.6.9"],\ ["depd", "npm:2.0.0"],\ ["destroy", "npm:1.2.0"],\ ["http-errors", "npm:2.0.0"],\ ["iconv-lite", "npm:0.4.24"],\ ["on-finished", "npm:2.4.1"],\ ["qs", "npm:6.11.0"],\ - ["raw-body", "npm:2.5.1"],\ + ["raw-body", "npm:2.5.2"],\ ["type-is", "npm:1.6.18"],\ ["unpipe", "npm:1.0.0"]\ ],\ @@ -965,10 +943,10 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { }]\ ]],\ ["cookie", [\ - ["npm:0.5.0", {\ - "packageLocation": "./.yarn/cache/cookie-npm-0.5.0-e2d58a161a-1f4bd2ca57.zip/node_modules/cookie/",\ + ["npm:0.6.0", {\ + "packageLocation": "./.yarn/cache/cookie-npm-0.6.0-362d6a2e45-f56a7d32a0.zip/node_modules/cookie/",\ "packageDependencies": [\ - ["cookie", "npm:0.5.0"]\ + ["cookie", "npm:0.6.0"]\ ],\ "linkType": "HARD"\ }]\ @@ -1046,17 +1024,6 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { "linkType": "HARD"\ }]\ ]],\ - ["css-tree", [\ - ["npm:2.3.1", {\ - "packageLocation": "./.yarn/cache/css-tree-npm-2.3.1-6540d78e26-493cc24b5c.zip/node_modules/css-tree/",\ - "packageDependencies": [\ - ["css-tree", "npm:2.3.1"],\ - ["mdn-data", "npm:2.0.30"],\ - ["source-map-js", "npm:1.0.2"]\ - ],\ - "linkType": "HARD"\ - }]\ - ]],\ ["css-what", [\ ["npm:2.1.3", {\ "packageLocation": "./.yarn/cache/css-what-npm-2.1.3-a9583898e8-a52d56c591.zip/node_modules/css-what/",\ @@ -1119,10 +1086,10 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ],\ "linkType": "SOFT"\ }],\ - ["virtual:759fd14db92b54abdb7afb3d21dbf8d50f1a5c59c96cd3f963ce3e3ed063bdb801142fae5f01cc81fb79f7ddc13b7c31a9deb9d5a9cfa48ec107f83de8f7f40e#npm:2.6.9", {\ - "packageLocation": "./.yarn/__virtual__/debug-virtual-c49e738777/0/cache/debug-npm-2.6.9-7d4cb597dc-d2f51589ca.zip/node_modules/debug/",\ + ["virtual:44738662cf800ff2863ba9baeabb817b24a959a14f86e20a31680e5dc79a4a738f7ceb7dca32753d579fae475aa061dffad8228a3391f3a9546b122f077e29a5#npm:2.6.9", {\ + "packageLocation": "./.yarn/__virtual__/debug-virtual-fad9a3537e/0/cache/debug-npm-2.6.9-7d4cb597dc-d2f51589ca.zip/node_modules/debug/",\ "packageDependencies": [\ - ["debug", "virtual:759fd14db92b54abdb7afb3d21dbf8d50f1a5c59c96cd3f963ce3e3ed063bdb801142fae5f01cc81fb79f7ddc13b7c31a9deb9d5a9cfa48ec107f83de8f7f40e#npm:2.6.9"],\ + ["debug", "virtual:44738662cf800ff2863ba9baeabb817b24a959a14f86e20a31680e5dc79a4a738f7ceb7dca32753d579fae475aa061dffad8228a3391f3a9546b122f077e29a5#npm:2.6.9"],\ ["@types/supports-color", null],\ ["ms", "npm:2.0.0"],\ ["supports-color", null]\ @@ -1133,13 +1100,13 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ],\ "linkType": "HARD"\ }],\ - ["virtual:8bdf672d54f36156a0f721b1434bbc1348d0f0fc5e805c421e22316652d3adb4ab5ec9db167a289ec9115ad44ae048edb781152c06b39311b623662569c1a6c3#npm:3.2.7", {\ - "packageLocation": "./.yarn/__virtual__/debug-virtual-2769557a9c/0/cache/debug-npm-3.2.7-754e818c7a-b3d8c59407.zip/node_modules/debug/",\ + ["virtual:8227ac539006e531918bf5d88077c531afe15318bf6ce5ee77403518d89d4658ce626b0cc91e5d6720c6653c20bec637cd3b5669f8da924206a1b75c70a98f67#npm:4.3.4", {\ + "packageLocation": "./.yarn/__virtual__/debug-virtual-d234701f3c/0/cache/debug-npm-4.3.4-4513954577-3dbad3f94e.zip/node_modules/debug/",\ "packageDependencies": [\ - ["debug", "virtual:8bdf672d54f36156a0f721b1434bbc1348d0f0fc5e805c421e22316652d3adb4ab5ec9db167a289ec9115ad44ae048edb781152c06b39311b623662569c1a6c3#npm:3.2.7"],\ + ["debug", "virtual:8227ac539006e531918bf5d88077c531afe15318bf6ce5ee77403518d89d4658ce626b0cc91e5d6720c6653c20bec637cd3b5669f8da924206a1b75c70a98f67#npm:4.3.4"],\ ["@types/supports-color", null],\ - ["ms", "npm:2.1.3"],\ - ["supports-color", null]\ + ["ms", "npm:2.1.2"],\ + ["supports-color", "npm:5.5.0"]\ ],\ "packagePeers": [\ "@types/supports-color",\ @@ -1147,12 +1114,12 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ],\ "linkType": "HARD"\ }],\ - ["virtual:ac3d8e680759ce54399273724d44e041d6c9b73454d191d411a8c44bb27e22f02aaf6ed9d3ad0ac1c298eac4833cff369c9c7b84c573016112c4f84be2cd8543#npm:4.3.4", {\ - "packageLocation": "./.yarn/__virtual__/debug-virtual-ebc9063b40/0/cache/debug-npm-4.3.4-4513954577-3dbad3f94e.zip/node_modules/debug/",\ + ["virtual:8bdf672d54f36156a0f721b1434bbc1348d0f0fc5e805c421e22316652d3adb4ab5ec9db167a289ec9115ad44ae048edb781152c06b39311b623662569c1a6c3#npm:3.2.7", {\ + "packageLocation": "./.yarn/__virtual__/debug-virtual-2769557a9c/0/cache/debug-npm-3.2.7-754e818c7a-b3d8c59407.zip/node_modules/debug/",\ "packageDependencies": [\ - ["debug", "virtual:ac3d8e680759ce54399273724d44e041d6c9b73454d191d411a8c44bb27e22f02aaf6ed9d3ad0ac1c298eac4833cff369c9c7b84c573016112c4f84be2cd8543#npm:4.3.4"],\ + ["debug", "virtual:8bdf672d54f36156a0f721b1434bbc1348d0f0fc5e805c421e22316652d3adb4ab5ec9db167a289ec9115ad44ae048edb781152c06b39311b623662569c1a6c3#npm:3.2.7"],\ ["@types/supports-color", null],\ - ["ms", "npm:2.1.2"],\ + ["ms", "npm:2.1.3"],\ ["supports-color", null]\ ],\ "packagePeers": [\ @@ -1161,13 +1128,13 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ],\ "linkType": "HARD"\ }],\ - ["virtual:cdcc6f3da7f89f4f693b033af4f99b7f7eb2f3f501c7d5f495b2e59334593feeb573fc7147bf9c632d1fc88514fbaf4f1d948c77e8f525aefbead37e648d68e4#npm:4.3.4", {\ - "packageLocation": "./.yarn/__virtual__/debug-virtual-ebdf22dbe0/0/cache/debug-npm-4.3.4-4513954577-3dbad3f94e.zip/node_modules/debug/",\ + ["virtual:ac3d8e680759ce54399273724d44e041d6c9b73454d191d411a8c44bb27e22f02aaf6ed9d3ad0ac1c298eac4833cff369c9c7b84c573016112c4f84be2cd8543#npm:4.3.4", {\ + "packageLocation": "./.yarn/__virtual__/debug-virtual-ebc9063b40/0/cache/debug-npm-4.3.4-4513954577-3dbad3f94e.zip/node_modules/debug/",\ "packageDependencies": [\ - ["debug", "virtual:cdcc6f3da7f89f4f693b033af4f99b7f7eb2f3f501c7d5f495b2e59334593feeb573fc7147bf9c632d1fc88514fbaf4f1d948c77e8f525aefbead37e648d68e4#npm:4.3.4"],\ + ["debug", "virtual:ac3d8e680759ce54399273724d44e041d6c9b73454d191d411a8c44bb27e22f02aaf6ed9d3ad0ac1c298eac4833cff369c9c7b84c573016112c4f84be2cd8543#npm:4.3.4"],\ ["@types/supports-color", null],\ ["ms", "npm:2.1.2"],\ - ["supports-color", "npm:5.5.0"]\ + ["supports-color", null]\ ],\ "packagePeers": [\ "@types/supports-color",\ @@ -1495,18 +1462,18 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { }]\ ]],\ ["express", [\ - ["npm:4.18.2", {\ - "packageLocation": "./.yarn/cache/express-npm-4.18.2-bb15ff679a-3c4b9b0768.zip/node_modules/express/",\ + ["npm:4.19.2", {\ + "packageLocation": "./.yarn/cache/express-npm-4.19.2-f81334a22a-212dbd6c2c.zip/node_modules/express/",\ "packageDependencies": [\ - ["express", "npm:4.18.2"],\ + ["express", "npm:4.19.2"],\ ["accepts", "npm:1.3.8"],\ ["array-flatten", "npm:1.1.1"],\ - ["body-parser", "npm:1.20.1"],\ + ["body-parser", "npm:1.20.2"],\ ["content-disposition", "npm:0.5.4"],\ ["content-type", "npm:1.0.5"],\ - ["cookie", "npm:0.5.0"],\ + ["cookie", "npm:0.6.0"],\ ["cookie-signature", "npm:1.0.6"],\ - ["debug", "virtual:759fd14db92b54abdb7afb3d21dbf8d50f1a5c59c96cd3f963ce3e3ed063bdb801142fae5f01cc81fb79f7ddc13b7c31a9deb9d5a9cfa48ec107f83de8f7f40e#npm:2.6.9"],\ + ["debug", "virtual:44738662cf800ff2863ba9baeabb817b24a959a14f86e20a31680e5dc79a4a738f7ceb7dca32753d579fae475aa061dffad8228a3391f3a9546b122f077e29a5#npm:2.6.9"],\ ["depd", "npm:2.0.0"],\ ["encodeurl", "npm:1.0.2"],\ ["escape-html", "npm:1.0.3"],\ @@ -1568,7 +1535,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { "packageLocation": "./.yarn/cache/finalhandler-npm-1.2.0-593d001463-92effbfd32.zip/node_modules/finalhandler/",\ "packageDependencies": [\ ["finalhandler", "npm:1.2.0"],\ - ["debug", "virtual:759fd14db92b54abdb7afb3d21dbf8d50f1a5c59c96cd3f963ce3e3ed063bdb801142fae5f01cc81fb79f7ddc13b7c31a9deb9d5a9cfa48ec107f83de8f7f40e#npm:2.6.9"],\ + ["debug", "virtual:44738662cf800ff2863ba9baeabb817b24a959a14f86e20a31680e5dc79a4a738f7ceb7dca32753d579fae475aa061dffad8228a3391f3a9546b122f077e29a5#npm:2.6.9"],\ ["encodeurl", "npm:1.0.2"],\ ["escape-html", "npm:1.0.3"],\ ["on-finished", "npm:2.4.1"],\ @@ -1941,10 +1908,10 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ],\ "linkType": "HARD"\ }],\ - ["npm:7.0.0", {\ - "packageLocation": "./.yarn/cache/http-proxy-agent-npm-7.0.0-106a57cc8c-48d4fac997.zip/node_modules/http-proxy-agent/",\ + ["npm:7.0.2", {\ + "packageLocation": "./.yarn/cache/http-proxy-agent-npm-7.0.2-643ed7cc33-670858c8f8.zip/node_modules/http-proxy-agent/",\ "packageDependencies": [\ - ["http-proxy-agent", "npm:7.0.0"],\ + ["http-proxy-agent", "npm:7.0.2"],\ ["agent-base", "npm:7.1.0"],\ ["debug", "virtual:ac3d8e680759ce54399273724d44e041d6c9b73454d191d411a8c44bb27e22f02aaf6ed9d3ad0ac1c298eac4833cff369c9c7b84c573016112c4f84be2cd8543#npm:4.3.4"]\ ],\ @@ -1972,10 +1939,10 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ],\ "linkType": "HARD"\ }],\ - ["npm:7.0.2", {\ - "packageLocation": "./.yarn/cache/https-proxy-agent-npm-7.0.2-83ea6a5d42-088969a0dd.zip/node_modules/https-proxy-agent/",\ + ["npm:7.0.4", {\ + "packageLocation": "./.yarn/cache/https-proxy-agent-npm-7.0.4-a51e13f5dc-daaab857a9.zip/node_modules/https-proxy-agent/",\ "packageDependencies": [\ - ["https-proxy-agent", "npm:7.0.2"],\ + ["https-proxy-agent", "npm:7.0.4"],\ ["agent-base", "npm:7.1.0"],\ ["debug", "virtual:ac3d8e680759ce54399273724d44e041d6c9b73454d191d411a8c44bb27e22f02aaf6ed9d3ad0ac1c298eac4833cff369c9c7b84c573016112c4f84be2cd8543#npm:4.3.4"]\ ],\ @@ -2199,18 +2166,17 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { }]\ ]],\ ["jsdom", [\ - ["npm:23.2.0", {\ - "packageLocation": "./.yarn/cache/jsdom-npm-23.2.0-64117d1ecf-3ba97e6ac5.zip/node_modules/jsdom/",\ + ["npm:24.1.0", {\ + "packageLocation": "./.yarn/cache/jsdom-npm-24.1.0-31752dcdec-c24b244308.zip/node_modules/jsdom/",\ "packageDependencies": [\ - ["jsdom", "npm:23.2.0"]\ + ["jsdom", "npm:24.1.0"]\ ],\ "linkType": "SOFT"\ }],\ - ["virtual:1c70d8e181737d5ab39c4d8abcf877d4935835cff8dbf876c1e1cec646046c8ec891c0654f862bb1538b798be313c6cdee86426894f1f831e3428f7823990ff4#npm:23.2.0", {\ - "packageLocation": "./.yarn/__virtual__/jsdom-virtual-b0a0b9cc80/0/cache/jsdom-npm-23.2.0-64117d1ecf-3ba97e6ac5.zip/node_modules/jsdom/",\ + ["virtual:1c70d8e181737d5ab39c4d8abcf877d4935835cff8dbf876c1e1cec646046c8ec891c0654f862bb1538b798be313c6cdee86426894f1f831e3428f7823990ff4#npm:24.1.0", {\ + "packageLocation": "./.yarn/__virtual__/jsdom-virtual-c8939e3d67/0/cache/jsdom-npm-24.1.0-31752dcdec-c24b244308.zip/node_modules/jsdom/",\ "packageDependencies": [\ - ["jsdom", "virtual:1c70d8e181737d5ab39c4d8abcf877d4935835cff8dbf876c1e1cec646046c8ec891c0654f862bb1538b798be313c6cdee86426894f1f831e3428f7823990ff4#npm:23.2.0"],\ - ["@asamuzakjp/dom-selector", "npm:2.0.2"],\ + ["jsdom", "virtual:1c70d8e181737d5ab39c4d8abcf877d4935835cff8dbf876c1e1cec646046c8ec891c0654f862bb1538b798be313c6cdee86426894f1f831e3428f7823990ff4#npm:24.1.0"],\ ["@types/canvas", null],\ ["canvas", null],\ ["cssstyle", "npm:4.0.1"],\ @@ -2218,20 +2184,21 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["decimal.js", "npm:10.4.3"],\ ["form-data", "npm:4.0.0"],\ ["html-encoding-sniffer", "npm:4.0.0"],\ - ["http-proxy-agent", "npm:7.0.0"],\ - ["https-proxy-agent", "npm:7.0.2"],\ + ["http-proxy-agent", "npm:7.0.2"],\ + ["https-proxy-agent", "npm:7.0.4"],\ ["is-potential-custom-element-name", "npm:1.0.1"],\ + ["nwsapi", "npm:2.2.10"],\ ["parse5", "npm:7.1.2"],\ - ["rrweb-cssom", "npm:0.6.0"],\ + ["rrweb-cssom", "npm:0.7.0"],\ ["saxes", "npm:6.0.0"],\ ["symbol-tree", "npm:3.2.4"],\ - ["tough-cookie", "npm:4.1.3"],\ + ["tough-cookie", "npm:4.1.4"],\ ["w3c-xmlserializer", "npm:5.0.0"],\ ["webidl-conversions", "npm:7.0.0"],\ ["whatwg-encoding", "npm:3.1.1"],\ ["whatwg-mimetype", "npm:4.0.0"],\ ["whatwg-url", "npm:14.0.0"],\ - ["ws", "virtual:b0a0b9cc8073835baf92596f5e5eb59957372d5136b980d9de48eabb2d4f8ef67b076625484b5d0641159e3a7a9db98b4744ccb323a5281ac8904ed44ba82d69#npm:8.16.0"],\ + ["ws", "virtual:c8939e3d67bc96e26407dde895811122a01ec0b4adfb15cdb85548dc5f13536b8870cf57eb2abb11d6a7a77f783fde1291dc3538d81b216481fdf69d4dd6fb8f#npm:8.17.0"],\ ["xml-name-validator", "npm:5.0.0"]\ ],\ "packagePeers": [\ @@ -2481,15 +2448,6 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { "linkType": "HARD"\ }]\ ]],\ - ["mdn-data", [\ - ["npm:2.0.30", {\ - "packageLocation": "./.yarn/cache/mdn-data-npm-2.0.30-bf7b39c09a-d6ac5ac743.zip/node_modules/mdn-data/",\ - "packageDependencies": [\ - ["mdn-data", "npm:2.0.30"]\ - ],\ - "linkType": "HARD"\ - }]\ - ]],\ ["media-typer", [\ ["npm:0.3.0", {\ "packageLocation": "./.yarn/cache/media-typer-npm-0.3.0-8674f8f0f5-af1b38516c.zip/node_modules/media-typer/",\ @@ -2723,15 +2681,15 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["@folder/xdg", "npm:4.0.1"],\ ["@mozilla/readability", "npm:0.5.0"],\ ["@types/express", "npm:4.17.21"],\ - ["@types/jsdom", "npm:21.1.6"],\ - ["@types/node", "npm:20.11.0"],\ + ["@types/jsdom", "npm:21.1.7"],\ + ["@types/node", "npm:20.13.0"],\ ["concurrently", "npm:8.2.2"],\ ["epub-gen", "npm:0.1.0"],\ - ["express", "npm:4.18.2"],\ + ["express", "npm:4.19.2"],\ ["feed", "npm:4.2.2"],\ ["got", "npm:12.6.1"],\ - ["jsdom", "virtual:1c70d8e181737d5ab39c4d8abcf877d4935835cff8dbf876c1e1cec646046c8ec891c0654f862bb1538b798be313c6cdee86426894f1f831e3428f7823990ff4#npm:23.2.0"],\ - ["nodemon", "npm:3.0.2"],\ + ["jsdom", "virtual:1c70d8e181737d5ab39c4d8abcf877d4935835cff8dbf876c1e1cec646046c8ec891c0654f862bb1538b798be313c6cdee86426894f1f831e3428f7823990ff4#npm:24.1.0"],\ + ["nodemon", "npm:3.1.2"],\ ["typescript", "patch:typescript@npm%3A5.3.3#~builtin::version=5.3.3&hash=14eedb"],\ ["xmlbuilder2", "npm:3.1.1"]\ ],\ @@ -2759,12 +2717,12 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { }]\ ]],\ ["nodemon", [\ - ["npm:3.0.2", {\ - "packageLocation": "./.yarn/unplugged/nodemon-npm-3.0.2-cdcc6f3da7/node_modules/nodemon/",\ + ["npm:3.1.2", {\ + "packageLocation": "./.yarn/unplugged/nodemon-npm-3.1.2-8227ac5390/node_modules/nodemon/",\ "packageDependencies": [\ - ["nodemon", "npm:3.0.2"],\ + ["nodemon", "npm:3.1.2"],\ ["chokidar", "npm:3.5.3"],\ - ["debug", "virtual:cdcc6f3da7f89f4f693b033af4f99b7f7eb2f3f501c7d5f495b2e59334593feeb573fc7147bf9c632d1fc88514fbaf4f1d948c77e8f525aefbead37e648d68e4#npm:4.3.4"],\ + ["debug", "virtual:8227ac539006e531918bf5d88077c531afe15318bf6ce5ee77403518d89d4658ce626b0cc91e5d6720c6653c20bec637cd3b5669f8da924206a1b75c70a98f67#npm:4.3.4"],\ ["ignore-by-default", "npm:1.0.1"],\ ["minimatch", "npm:3.1.2"],\ ["pstree.remy", "npm:1.1.8"],\ @@ -2836,6 +2794,15 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { "linkType": "HARD"\ }]\ ]],\ + ["nwsapi", [\ + ["npm:2.2.10", {\ + "packageLocation": "./.yarn/cache/nwsapi-npm-2.2.10-d9c9a3f5f1-5f1d361b38.zip/node_modules/nwsapi/",\ + "packageDependencies": [\ + ["nwsapi", "npm:2.2.10"]\ + ],\ + "linkType": "HARD"\ + }]\ + ]],\ ["object-inspect", [\ ["npm:1.12.3", {\ "packageLocation": "./.yarn/cache/object-inspect-npm-1.12.3-1e7d20f5ff-dabfd824d9.zip/node_modules/object-inspect/",\ @@ -3070,10 +3037,10 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { }]\ ]],\ ["raw-body", [\ - ["npm:2.5.1", {\ - "packageLocation": "./.yarn/cache/raw-body-npm-2.5.1-9dd1d9fff9-5362adff15.zip/node_modules/raw-body/",\ + ["npm:2.5.2", {\ + "packageLocation": "./.yarn/cache/raw-body-npm-2.5.2-5cb9dfebc1-ba1583c8d8.zip/node_modules/raw-body/",\ "packageDependencies": [\ - ["raw-body", "npm:2.5.1"],\ + ["raw-body", "npm:2.5.2"],\ ["bytes", "npm:3.1.2"],\ ["http-errors", "npm:2.0.0"],\ ["iconv-lite", "npm:0.4.24"],\ @@ -3136,15 +3103,6 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { "linkType": "HARD"\ }]\ ]],\ - ["require-from-string", [\ - ["npm:2.0.2", {\ - "packageLocation": "./.yarn/cache/require-from-string-npm-2.0.2-8557e0db12-a03ef68954.zip/node_modules/require-from-string/",\ - "packageDependencies": [\ - ["require-from-string", "npm:2.0.2"]\ - ],\ - "linkType": "HARD"\ - }]\ - ]],\ ["requires-port", [\ ["npm:1.0.0", {\ "packageLocation": "./.yarn/cache/requires-port-npm-1.0.0-fd036b488a-eee0e303ad.zip/node_modules/requires-port/",\ @@ -3207,6 +3165,13 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["rrweb-cssom", "npm:0.6.0"]\ ],\ "linkType": "HARD"\ + }],\ + ["npm:0.7.0", {\ + "packageLocation": "./.yarn/cache/rrweb-cssom-npm-0.7.0-33b3c8e550-32976e4540.zip/node_modules/rrweb-cssom/",\ + "packageDependencies": [\ + ["rrweb-cssom", "npm:0.7.0"]\ + ],\ + "linkType": "HARD"\ }]\ ]],\ ["rxjs", [\ @@ -3278,7 +3243,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { "packageLocation": "./.yarn/cache/send-npm-0.18.0-faadf6353f-74fc07ebb5.zip/node_modules/send/",\ "packageDependencies": [\ ["send", "npm:0.18.0"],\ - ["debug", "virtual:759fd14db92b54abdb7afb3d21dbf8d50f1a5c59c96cd3f963ce3e3ed063bdb801142fae5f01cc81fb79f7ddc13b7c31a9deb9d5a9cfa48ec107f83de8f7f40e#npm:2.6.9"],\ + ["debug", "virtual:44738662cf800ff2863ba9baeabb817b24a959a14f86e20a31680e5dc79a4a738f7ceb7dca32753d579fae475aa061dffad8228a3391f3a9546b122f077e29a5#npm:2.6.9"],\ ["depd", "npm:2.0.0"],\ ["destroy", "npm:1.2.0"],\ ["encodeurl", "npm:1.0.2"],\ @@ -3424,15 +3389,6 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { "linkType": "HARD"\ }]\ ]],\ - ["source-map-js", [\ - ["npm:1.0.2", {\ - "packageLocation": "./.yarn/cache/source-map-js-npm-1.0.2-ee4f9f9b30-c049a7fc4d.zip/node_modules/source-map-js/",\ - "packageDependencies": [\ - ["source-map-js", "npm:1.0.2"]\ - ],\ - "linkType": "HARD"\ - }]\ - ]],\ ["spawn-command", [\ ["npm:0.0.2", {\ "packageLocation": "./.yarn/cache/spawn-command-npm-0.0.2-014d4d5d9f-e35c5d2817.zip/node_modules/spawn-command/",\ @@ -3659,10 +3615,10 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { }]\ ]],\ ["tough-cookie", [\ - ["npm:4.1.3", {\ - "packageLocation": "./.yarn/cache/tough-cookie-npm-4.1.3-08285e2518-c9226afff3.zip/node_modules/tough-cookie/",\ + ["npm:4.1.4", {\ + "packageLocation": "./.yarn/cache/tough-cookie-npm-4.1.4-8293cc8bd5-5815059f01.zip/node_modules/tough-cookie/",\ "packageDependencies": [\ - ["tough-cookie", "npm:4.1.3"],\ + ["tough-cookie", "npm:4.1.4"],\ ["psl", "npm:1.9.0"],\ ["punycode", "npm:2.3.0"],\ ["universalify", "npm:0.2.0"],\ @@ -3959,17 +3915,17 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { }]\ ]],\ ["ws", [\ - ["npm:8.16.0", {\ - "packageLocation": "./.yarn/cache/ws-npm-8.16.0-46943f6199-feb3eecd2b.zip/node_modules/ws/",\ + ["npm:8.17.0", {\ + "packageLocation": "./.yarn/cache/ws-npm-8.17.0-05fb441faf-147ef9eab0.zip/node_modules/ws/",\ "packageDependencies": [\ - ["ws", "npm:8.16.0"]\ + ["ws", "npm:8.17.0"]\ ],\ "linkType": "SOFT"\ }],\ - ["virtual:b0a0b9cc8073835baf92596f5e5eb59957372d5136b980d9de48eabb2d4f8ef67b076625484b5d0641159e3a7a9db98b4744ccb323a5281ac8904ed44ba82d69#npm:8.16.0", {\ - "packageLocation": "./.yarn/__virtual__/ws-virtual-ac0b781d78/0/cache/ws-npm-8.16.0-46943f6199-feb3eecd2b.zip/node_modules/ws/",\ + ["virtual:c8939e3d67bc96e26407dde895811122a01ec0b4adfb15cdb85548dc5f13536b8870cf57eb2abb11d6a7a77f783fde1291dc3538d81b216481fdf69d4dd6fb8f#npm:8.17.0", {\ + "packageLocation": "./.yarn/__virtual__/ws-virtual-0399260913/0/cache/ws-npm-8.17.0-05fb441faf-147ef9eab0.zip/node_modules/ws/",\ "packageDependencies": [\ - ["ws", "virtual:b0a0b9cc8073835baf92596f5e5eb59957372d5136b980d9de48eabb2d4f8ef67b076625484b5d0641159e3a7a9db98b4744ccb323a5281ac8904ed44ba82d69#npm:8.16.0"],\ + ["ws", "virtual:c8939e3d67bc96e26407dde895811122a01ec0b4adfb15cdb85548dc5f13536b8870cf57eb2abb11d6a7a77f783fde1291dc3538d81b216481fdf69d4dd6fb8f#npm:8.17.0"],\ ["@types/bufferutil", null],\ ["@types/utf-8-validate", null],\ ["bufferutil", null],\ diff --git a/Dockerfile b/Dockerfile index 781c885..23ff601 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM node:20 +FROM node:22 LABEL org.opencontainers.image.source=https://github.com/BHSPitMonkey/news2reader LABEL org.opencontainers.image.description=" Serve online articles directly to your e-reader using OPDS" @@ -7,7 +7,7 @@ LABEL org.opencontainers.image.licenses=MIT WORKDIR /usr/src/app COPY package.json yarn.lock ./ -# Note: The node:18 image ships with Yarn 1.x, not 2/3 +# Note: The node:22 image ships with Yarn 1.x, not 2/3 RUN yarn install --immutable --network-timeout 600000 COPY dist/ ./dist/ diff --git a/README.md b/README.md index e64de81..0a836af 100644 --- a/README.md +++ b/README.md @@ -61,7 +61,7 @@ You will need to mount a config directory at `/root/.config/news2reader/` in the ### Run via Node.js -(Tested using Node 20.x) +(Tested using Node 22.x) ```shell yarn install diff --git a/dist/epub.js b/dist/epub.js index 483f1b2..cbcc5af 100644 --- a/dist/epub.js +++ b/dist/epub.js @@ -4,6 +4,11 @@ import Epub from "epub-gen"; import jsdom from "jsdom"; import { Readability } from "@mozilla/readability"; import got from "got"; +const HEADERS = { + 'accept': 'text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8', + 'cache-control': 'no-cache', + 'user-agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/125.0.0.0 Safari/537.3', +}; export async function articleToEpub(url, preferredTitle) { var _a; const urlObj = new URL(url); @@ -12,7 +17,9 @@ export async function articleToEpub(url, preferredTitle) { const outputPath = "/tmp/news2opds-out.epub"; const virtualConsole = new jsdom.VirtualConsole(); console.log(`Processing article at URL ${url} to path ${outputPath}`); - const { body } = await got(url); + const { body } = await got(url, { + headers: HEADERS + }); console.log(`Fetched ${body.length} chars from ${url}`); // Create a JSDOM const dom = new jsdom.JSDOM(body, { url, virtualConsole }); diff --git a/package.json b/package.json index e7ec139..c63409c 100644 --- a/package.json +++ b/package.json @@ -14,24 +14,24 @@ "./src/provider/pocket": "./dist/src/provider/pocket.js" }, "engines": { - "node": ">= 20.0.0" + "node": ">= 22.0.0" }, "dependencies": { "@folder/xdg": "^4.0.1", "@mozilla/readability": "^0.5.0", - "@types/jsdom": "^21.1.6", + "@types/jsdom": "^21.1.7", "epub-gen": "^0.1.0", - "express": "^4.18.2", + "express": "^4.19.2", "feed": "^4.2.2", "got": "^12.6.1", - "jsdom": "^23.2.0", + "jsdom": "^24.1.0", "xmlbuilder2": "^3.1.1" }, "devDependencies": { "@types/express": "^4.17.21", - "@types/node": "^20.11.0", + "@types/node": "^20.13.0", "concurrently": "^8.2.2", - "nodemon": "^3.0.2", + "nodemon": "^3.1.2", "typescript": "^5.3.3" } } diff --git a/src/epub.ts b/src/epub.ts index 1221d61..56dc4ca 100644 --- a/src/epub.ts +++ b/src/epub.ts @@ -5,6 +5,12 @@ import jsdom from "jsdom"; import { Readability } from "@mozilla/readability"; import got from "got"; +const HEADERS = { + 'accept': 'text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8', + 'cache-control': 'no-cache', + 'user-agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/125.0.0.0 Safari/537.3', +}; + export async function articleToEpub( url: string, preferredTitle: string | null @@ -18,7 +24,9 @@ export async function articleToEpub( console.log(`Processing article at URL ${url} to path ${outputPath}`); - const { body } = await got(url); + const { body } = await got(url, { + headers: HEADERS + }); console.log(`Fetched ${body.length} chars from ${url}`); // Create a JSDOM diff --git a/yarn.lock b/yarn.lock index 76c5f52..44317f9 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5,17 +5,6 @@ __metadata: version: 6 cacheKey: 8 -"@asamuzakjp/dom-selector@npm:^2.0.1": - version: 2.0.2 - resolution: "@asamuzakjp/dom-selector@npm:2.0.2" - dependencies: - bidi-js: ^1.0.3 - css-tree: ^2.3.1 - is-potential-custom-element-name: ^1.0.1 - checksum: a454537fcba4f241d3c1303f6068944462fc0ba9cd2c5e3ad639c0acb58ffb7809e5d4cbdac805c8c2525b2450d53a992ff98f07a323c5246044e8e3de3561fe - languageName: node - linkType: hard - "@babel/runtime@npm:^7.21.0": version: 7.22.6 resolution: "@babel/runtime@npm:7.22.6" @@ -192,14 +181,14 @@ __metadata: languageName: node linkType: hard -"@types/jsdom@npm:^21.1.6": - version: 21.1.6 - resolution: "@types/jsdom@npm:21.1.6" +"@types/jsdom@npm:^21.1.7": + version: 21.1.7 + resolution: "@types/jsdom@npm:21.1.7" dependencies: "@types/node": "*" "@types/tough-cookie": "*" parse5: ^7.0.0 - checksum: d6fbaab3065ec0bc5b54ae2f15eb18f28045ffa5cece438f96f4bc86819fc8c547e96cede650d14516429dfdc45075b36a46c135849f868b1ae8281717c8e591 + checksum: b7465d5a471ed4e68a54e2639c534d364134674598687be69645736731215e7407fe37a4af66dc616ef03be9c5515cb355df2eda5c8080146c05bd569ea8810d languageName: node linkType: hard @@ -224,12 +213,12 @@ __metadata: languageName: node linkType: hard -"@types/node@npm:^20.11.0": - version: 20.11.0 - resolution: "@types/node@npm:20.11.0" +"@types/node@npm:^20.13.0": + version: 20.13.0 + resolution: "@types/node@npm:20.13.0" dependencies: undici-types: ~5.26.4 - checksum: 1bd6890db7e0404d11c33d28f46f19f73256f0ba35d19f0ef2a0faba09f366f188915fb9338eebebcc472075c1c4941e17c7002786aa69afa44980737846b200 + checksum: 8e061ecd6649bb587b047cee765f530ec43930f30cd47558d9630f5a802d61cf951e9205c610864cfbd58f70478612123e8cb46d58eb4855c695fb8fcaff5b7c languageName: node linkType: hard @@ -476,15 +465,6 @@ __metadata: languageName: node linkType: hard -"bidi-js@npm:^1.0.3": - version: 1.0.3 - resolution: "bidi-js@npm:1.0.3" - dependencies: - require-from-string: ^2.0.2 - checksum: 877c5dcfd69a35fd30fee9e49a03faf205a7a4cd04a38af7648974a659cab7b1cd51fa881d7957c07bd1fc5adf22b90a56da3617bb0885ee69d58ff41117658c - languageName: node - linkType: hard - "binary-extensions@npm:^2.0.0": version: 2.2.0 resolution: "binary-extensions@npm:2.2.0" @@ -503,12 +483,12 @@ __metadata: languageName: node linkType: hard -"body-parser@npm:1.20.1": - version: 1.20.1 - resolution: "body-parser@npm:1.20.1" +"body-parser@npm:1.20.2": + version: 1.20.2 + resolution: "body-parser@npm:1.20.2" dependencies: bytes: 3.1.2 - content-type: ~1.0.4 + content-type: ~1.0.5 debug: 2.6.9 depd: 2.0.0 destroy: 1.2.0 @@ -516,10 +496,10 @@ __metadata: iconv-lite: 0.4.24 on-finished: 2.4.1 qs: 6.11.0 - raw-body: 2.5.1 + raw-body: 2.5.2 type-is: ~1.6.18 unpipe: 1.0.0 - checksum: f1050dbac3bede6a78f0b87947a8d548ce43f91ccc718a50dd774f3c81f2d8b04693e52acf62659fad23101827dd318da1fb1363444ff9a8482b886a3e4a5266 + checksum: 14d37ec638ab5c93f6099ecaed7f28f890d222c650c69306872e00b9efa081ff6c596cd9afb9930656aae4d6c4e1c17537bea12bb73c87a217cb3cfea8896737 languageName: node linkType: hard @@ -808,7 +788,7 @@ __metadata: languageName: node linkType: hard -"content-type@npm:~1.0.4": +"content-type@npm:~1.0.4, content-type@npm:~1.0.5": version: 1.0.5 resolution: "content-type@npm:1.0.5" checksum: 566271e0a251642254cde0f845f9dd4f9856e52d988f4eb0d0dcffbb7a1f8ec98de7a5215fc628f3bce30fe2fb6fd2bc064b562d721658c59b544e2d34ea2766 @@ -822,10 +802,10 @@ __metadata: languageName: node linkType: hard -"cookie@npm:0.5.0": - version: 0.5.0 - resolution: "cookie@npm:0.5.0" - checksum: 1f4bd2ca5765f8c9689a7e8954183f5332139eb72b6ff783d8947032ec1fdf43109852c178e21a953a30c0dd42257828185be01b49d1eb1a67fd054ca588a180 +"cookie@npm:0.6.0": + version: 0.6.0 + resolution: "cookie@npm:0.6.0" + checksum: f56a7d32a07db5458e79c726b77e3c2eff655c36792f2b6c58d351fb5f61531e5b1ab7f46987150136e366c65213cbe31729e02a3eaed630c3bf7334635fb410 languageName: node linkType: hard @@ -885,16 +865,6 @@ __metadata: languageName: node linkType: hard -"css-tree@npm:^2.3.1": - version: 2.3.1 - resolution: "css-tree@npm:2.3.1" - dependencies: - mdn-data: 2.0.30 - source-map-js: ^1.0.1 - checksum: 493cc24b5c22b05ee5314b8a0d72d8a5869491c1458017ae5ed75aeb6c3596637dbe1b11dac2548974624adec9f7a1f3a6cf40593dc1f9185eb0e8279543fbc0 - languageName: node - linkType: hard - "css-what@npm:2.1": version: 2.1.3 resolution: "css-what@npm:2.1.3" @@ -1234,16 +1204,16 @@ __metadata: languageName: node linkType: hard -"express@npm:^4.18.2": - version: 4.18.2 - resolution: "express@npm:4.18.2" +"express@npm:^4.19.2": + version: 4.19.2 + resolution: "express@npm:4.19.2" dependencies: accepts: ~1.3.8 array-flatten: 1.1.1 - body-parser: 1.20.1 + body-parser: 1.20.2 content-disposition: 0.5.4 content-type: ~1.0.4 - cookie: 0.5.0 + cookie: 0.6.0 cookie-signature: 1.0.6 debug: 2.6.9 depd: 2.0.0 @@ -1269,7 +1239,7 @@ __metadata: type-is: ~1.6.18 utils-merge: 1.0.1 vary: ~1.1.2 - checksum: 3c4b9b076879442f6b968fe53d85d9f1eeacbb4f4c41e5f16cc36d77ce39a2b0d81b3f250514982110d815b2f7173f5561367f9110fcc541f9371948e8c8b037 + checksum: 212dbd6c2c222a96a61bc927639c95970a53b06257080bb9e2838adb3bffdb966856551fdad1ab5dd654a217c35db94f987d0aa88d48fb04d306340f5f34dca5 languageName: node linkType: hard @@ -1646,13 +1616,13 @@ __metadata: languageName: node linkType: hard -"http-proxy-agent@npm:^7.0.0": - version: 7.0.0 - resolution: "http-proxy-agent@npm:7.0.0" +"http-proxy-agent@npm:^7.0.2": + version: 7.0.2 + resolution: "http-proxy-agent@npm:7.0.2" dependencies: agent-base: ^7.1.0 debug: ^4.3.4 - checksum: 48d4fac997917e15f45094852b63b62a46d0c8a4f0b9c6c23ca26d27b8df8d178bed88389e604745e748bd9a01f5023e25093722777f0593c3f052009ff438b6 + checksum: 670858c8f8f3146db5889e1fa117630910101db601fff7d5a8aa637da0abedf68c899f03d3451cac2f83bcc4c3d2dabf339b3aa00ff8080571cceb02c3ce02f3 languageName: node linkType: hard @@ -1676,13 +1646,13 @@ __metadata: languageName: node linkType: hard -"https-proxy-agent@npm:^7.0.2": - version: 7.0.2 - resolution: "https-proxy-agent@npm:7.0.2" +"https-proxy-agent@npm:^7.0.4": + version: 7.0.4 + resolution: "https-proxy-agent@npm:7.0.4" dependencies: agent-base: ^7.0.2 debug: 4 - checksum: 088969a0dd476ea7a0ed0a2cf1283013682b08f874c3bc6696c83fa061d2c157d29ef0ad3eb70a2046010bb7665573b2388d10fdcb3e410a66995e5248444292 + checksum: daaab857a967a2519ddc724f91edbbd388d766ff141b9025b629f92b9408fc83cee8a27e11a907aede392938e9c398e240d643e178408a59e4073539cde8cfe9 languageName: node linkType: hard @@ -1871,37 +1841,37 @@ __metadata: languageName: node linkType: hard -"jsdom@npm:^23.2.0": - version: 23.2.0 - resolution: "jsdom@npm:23.2.0" +"jsdom@npm:^24.1.0": + version: 24.1.0 + resolution: "jsdom@npm:24.1.0" dependencies: - "@asamuzakjp/dom-selector": ^2.0.1 cssstyle: ^4.0.1 data-urls: ^5.0.0 decimal.js: ^10.4.3 form-data: ^4.0.0 html-encoding-sniffer: ^4.0.0 - http-proxy-agent: ^7.0.0 - https-proxy-agent: ^7.0.2 + http-proxy-agent: ^7.0.2 + https-proxy-agent: ^7.0.4 is-potential-custom-element-name: ^1.0.1 + nwsapi: ^2.2.10 parse5: ^7.1.2 - rrweb-cssom: ^0.6.0 + rrweb-cssom: ^0.7.0 saxes: ^6.0.0 symbol-tree: ^3.2.4 - tough-cookie: ^4.1.3 + tough-cookie: ^4.1.4 w3c-xmlserializer: ^5.0.0 webidl-conversions: ^7.0.0 whatwg-encoding: ^3.1.1 whatwg-mimetype: ^4.0.0 whatwg-url: ^14.0.0 - ws: ^8.16.0 + ws: ^8.17.0 xml-name-validator: ^5.0.0 peerDependencies: canvas: ^2.11.2 peerDependenciesMeta: canvas: optional: true - checksum: 3ba97e6ac56c38d92d0ce2d0fac5de4042f7dec40d127872e1aa88dd379980f8ea2108a008319ceac54dc07a784078ed4b4401bf9109a76276ca2cace229c8df + checksum: c24b244308cabb2aabee2bdcc5041c810bc45320d0e8721c3eaaf5700d5f8498730809b10da4a97065abfccd937132700d64ae275491424c6b1b20a21d58d2e2 languageName: node linkType: hard @@ -2107,13 +2077,6 @@ __metadata: languageName: node linkType: hard -"mdn-data@npm:2.0.30": - version: 2.0.30 - resolution: "mdn-data@npm:2.0.30" - checksum: d6ac5ac7439a1607df44b22738ecf83f48e66a0874e4482d6424a61c52da5cde5750f1d1229b6f5fa1b80a492be89465390da685b11f97d62b8adcc6e88189aa - languageName: node - linkType: hard - "media-typer@npm:0.3.0": version: 0.3.0 resolution: "media-typer@npm:0.3.0" @@ -2329,15 +2292,15 @@ __metadata: "@folder/xdg": ^4.0.1 "@mozilla/readability": ^0.5.0 "@types/express": ^4.17.21 - "@types/jsdom": ^21.1.6 - "@types/node": ^20.11.0 + "@types/jsdom": ^21.1.7 + "@types/node": ^20.13.0 concurrently: ^8.2.2 epub-gen: ^0.1.0 - express: ^4.18.2 + express: ^4.19.2 feed: ^4.2.2 got: ^12.6.1 - jsdom: ^23.2.0 - nodemon: ^3.0.2 + jsdom: ^24.1.0 + nodemon: ^3.1.2 typescript: ^5.3.3 xmlbuilder2: ^3.1.1 languageName: unknown @@ -2364,9 +2327,9 @@ __metadata: languageName: node linkType: hard -"nodemon@npm:^3.0.2": - version: 3.0.2 - resolution: "nodemon@npm:3.0.2" +"nodemon@npm:^3.1.2": + version: 3.1.2 + resolution: "nodemon@npm:3.1.2" dependencies: chokidar: ^3.5.2 debug: ^4 @@ -2380,7 +2343,7 @@ __metadata: undefsafe: ^2.0.5 bin: nodemon: bin/nodemon.js - checksum: 61f3dd207ad444f4a7a2f1aa44adc886605c96c7bc6286291c2360e5e2cd26c3828c90a1418a60783a9da2463593383149135a5a4c099918c54d34a611745499 + checksum: 8ab01dcf970c66d9910ede58db7c24afca4839eaaadbeebbfac4b5f755cc8ba9fa72e0e2c1f14ef5081514d3b9c37888426d896b356adbe0450ccb5b461de0b9 languageName: node linkType: hard @@ -2441,6 +2404,13 @@ __metadata: languageName: node linkType: hard +"nwsapi@npm:^2.2.10": + version: 2.2.10 + resolution: "nwsapi@npm:2.2.10" + checksum: 5f1d361b38c47ab49727d5ea8bbfeb5867ae6de0e538eec9a8b77c88005ddde36d8b930e0730b50ee5e5dda949112c0f9ffed1bf15e7e1b3cd9cfa319f5a9b6f + languageName: node + linkType: hard + "object-inspect@npm:^1.9.0": version: 1.12.3 resolution: "object-inspect@npm:1.12.3" @@ -2637,15 +2607,15 @@ __metadata: languageName: node linkType: hard -"raw-body@npm:2.5.1": - version: 2.5.1 - resolution: "raw-body@npm:2.5.1" +"raw-body@npm:2.5.2": + version: 2.5.2 + resolution: "raw-body@npm:2.5.2" dependencies: bytes: 3.1.2 http-errors: 2.0.0 iconv-lite: 0.4.24 unpipe: 1.0.0 - checksum: 5362adff1575d691bb3f75998803a0ffed8c64eabeaa06e54b4ada25a0cd1b2ae7f4f5ec46565d1bec337e08b5ac90c76eaa0758de6f72a633f025d754dec29e + checksum: ba1583c8d8a48e8fbb7a873fdbb2df66ea4ff83775421bfe21ee120140949ab048200668c47d9ae3880012f6e217052690628cf679ddfbd82c9fc9358d574676 languageName: node linkType: hard @@ -2698,13 +2668,6 @@ __metadata: languageName: node linkType: hard -"require-from-string@npm:^2.0.2": - version: 2.0.2 - resolution: "require-from-string@npm:2.0.2" - checksum: a03ef6895445f33a4015300c426699bc66b2b044ba7b670aa238610381b56d3f07c686251740d575e22f4c87531ba662d06937508f0f3c0f1ddc04db3130560b - languageName: node - linkType: hard - "requires-port@npm:^1.0.0": version: 1.0.0 resolution: "requires-port@npm:1.0.0" @@ -2764,6 +2727,13 @@ __metadata: languageName: node linkType: hard +"rrweb-cssom@npm:^0.7.0": + version: 0.7.0 + resolution: "rrweb-cssom@npm:0.7.0" + checksum: 32976e45405bd376b6d3e8aada2455233f0c2aa9081c66b1fe59bf8074575fb9d60a9a286edd4925aca8bda7d6734b4170ca087ca528bb77840236ddfe0dd0b9 + languageName: node + linkType: hard + "rxjs@npm:^7.8.1": version: 7.8.1 resolution: "rxjs@npm:7.8.1" @@ -2953,13 +2923,6 @@ __metadata: languageName: node linkType: hard -"source-map-js@npm:^1.0.1": - version: 1.0.2 - resolution: "source-map-js@npm:1.0.2" - checksum: c049a7fc4deb9a7e9b481ae3d424cc793cb4845daa690bc5a05d428bf41bf231ced49b4cf0c9e77f9d42fdb3d20d6187619fc586605f5eabe995a316da8d377c - languageName: node - linkType: hard - "spawn-command@npm:0.0.2": version: 0.0.2 resolution: "spawn-command@npm:0.0.2" @@ -3168,15 +3131,15 @@ __metadata: languageName: node linkType: hard -"tough-cookie@npm:^4.1.3": - version: 4.1.3 - resolution: "tough-cookie@npm:4.1.3" +"tough-cookie@npm:^4.1.4": + version: 4.1.4 + resolution: "tough-cookie@npm:4.1.4" dependencies: psl: ^1.1.33 punycode: ^2.1.1 universalify: ^0.2.0 url-parse: ^1.5.3 - checksum: c9226afff36492a52118432611af083d1d8493a53ff41ec4ea48e5b583aec744b989e4280bcf476c910ec1525a89a4a0f1cae81c08b18fb2ec3a9b3a72b91dcc + checksum: 5815059f014c31179a303c673f753f7899a6fce94ac93712c88ea5f3c26e0c042b5f0c7a599a00f8e0feeca4615dba75c3dffc54f3c1a489978aa8205e09307c languageName: node linkType: hard @@ -3442,9 +3405,9 @@ __metadata: languageName: node linkType: hard -"ws@npm:^8.16.0": - version: 8.16.0 - resolution: "ws@npm:8.16.0" +"ws@npm:^8.17.0": + version: 8.17.0 + resolution: "ws@npm:8.17.0" peerDependencies: bufferutil: ^4.0.1 utf-8-validate: ">=5.0.2" @@ -3453,7 +3416,7 @@ __metadata: optional: true utf-8-validate: optional: true - checksum: feb3eecd2bae82fa8a8beef800290ce437d8b8063bdc69712725f21aef77c49cb2ff45c6e5e7fce622248f9c7abaee506bae0a9064067ffd6935460c7357321b + checksum: 147ef9eab0251364e1d2c55338ad0efb15e6913923ccbfdf20f7a8a6cb8f88432bcd7f4d8f66977135bfad35575644f9983201c1a361019594a4e53977bf6d4e languageName: node linkType: hard