From 1d47c66f7d4c9e173bcc1055bda0941918cdd67c Mon Sep 17 00:00:00 2001 From: Artemy Date: Tue, 14 May 2024 15:21:39 +0300 Subject: [PATCH] fix(plugins): html2text format --- packages/plugins/package.json | 6 ++++-- packages/plugins/src/lib.ts | 6 ++++++ packages/server/package.json | 2 -- packages/server/src/config/pluginConfig.ts | 5 ++--- pnpm-lock.yaml | 12 ++++++------ 5 files changed, 18 insertions(+), 13 deletions(-) diff --git a/packages/plugins/package.json b/packages/plugins/package.json index 8958ba5..a7d5490 100644 --- a/packages/plugins/package.json +++ b/packages/plugins/package.json @@ -19,10 +19,12 @@ "license": "MIT", "dependencies": { "@mozilla/readability": "^0.5.0", - "linkedom": "^0.18.0", - "@txtdot/sdk": "workspace:*" + "@txtdot/sdk": "workspace:*", + "html-to-text": "^9.0.5", + "linkedom": "^0.18.0" }, "devDependencies": { + "@types/html-to-text": "^9.0.4", "typescript": "^5.4.5" } } diff --git a/packages/plugins/src/lib.ts b/packages/plugins/src/lib.ts index be7f77f..f202e52 100644 --- a/packages/plugins/src/lib.ts +++ b/packages/plugins/src/lib.ts @@ -7,3 +7,9 @@ export const engineList = [ engines.SearX, engines.Readability, ]; + +import { compile } from 'html-to-text'; + +export const html2text = compile({ + selectors: [{ selector: 'img', format: 'skip' }], +}); diff --git a/packages/server/package.json b/packages/server/package.json index f3c2f99..077012f 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -30,7 +30,6 @@ "dotenv": "^16.3.1", "ejs": "^3.1.10", "fastify": "^4.26.2", - "html-to-text": "^9.0.5", "iconv-lite": "^0.6.3", "ip-range-check": "^0.2.0", "json-schema-to-ts": "^3.0.1", @@ -41,7 +40,6 @@ "devDependencies": { "@types/dompurify": "^3.0.5", "@types/ejs": "^3.1.5", - "@types/html-to-text": "^9.0.4", "@types/jsdom": "^21.1.6", "@types/micromatch": "^4.0.7", "clean-css-cli": "^5.6.3", diff --git a/packages/server/src/config/pluginConfig.ts b/packages/server/src/config/pluginConfig.ts index 1e7b139..3fc3dcb 100644 --- a/packages/server/src/config/pluginConfig.ts +++ b/packages/server/src/config/pluginConfig.ts @@ -1,6 +1,5 @@ import { IAppConfig } from '../types/pluginConfig'; -import { engineList } from '@txtdot/plugins'; -import { compile } from 'html-to-text'; +import { engineList, html2text } from '@txtdot/plugins'; /** * Configuration of plugins @@ -8,7 +7,7 @@ import { compile } from 'html-to-text'; */ const plugin_config: IAppConfig = { engines: [...engineList], - html2text: compile(), + html2text, }; export default plugin_config; diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 444be98..66e2073 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -41,10 +41,16 @@ importers: '@txtdot/sdk': specifier: workspace:* version: link:../sdk + html-to-text: + specifier: ^9.0.5 + version: 9.0.5 linkedom: specifier: ^0.18.0 version: 0.18.0 devDependencies: + '@types/html-to-text': + specifier: ^9.0.4 + version: 9.0.4 typescript: specifier: ^5.4.5 version: 5.4.5 @@ -103,9 +109,6 @@ importers: fastify: specifier: ^4.26.2 version: 4.27.0 - html-to-text: - specifier: ^9.0.5 - version: 9.0.5 iconv-lite: specifier: ^0.6.3 version: 0.6.3 @@ -131,9 +134,6 @@ importers: '@types/ejs': specifier: ^3.1.5 version: 3.1.5 - '@types/html-to-text': - specifier: ^9.0.4 - version: 9.0.4 '@types/jsdom': specifier: ^21.1.6 version: 21.1.6