From fc228ca47c5262e67f4ea62a0db66f0da70e15d5 Mon Sep 17 00:00:00 2001 From: Elian Doran Date: Fri, 18 Apr 2025 12:47:58 +0300 Subject: [PATCH] chore(monorepo/server): integrate turndown-plugin-gfm --- apps/server/src/services/export/markdown.ts | 2 +- apps/server/src/types.d.ts | 7 ++----- .../packages => packages}/turndown-plugin-gfm/.gitignore | 0 .../packages => packages}/turndown-plugin-gfm/.travis.yml | 0 .../packages => packages}/turndown-plugin-gfm/LICENSE | 0 .../packages => packages}/turndown-plugin-gfm/README.md | 0 .../turndown-plugin-gfm/build_for_test.sh | 0 .../config/rollup.config.browser.cjs.js | 0 .../turndown-plugin-gfm/config/rollup.config.browser.es.js | 0 .../turndown-plugin-gfm/config/rollup.config.cjs.js | 0 .../turndown-plugin-gfm/config/rollup.config.es.js | 0 .../turndown-plugin-gfm/config/rollup.config.iife.js | 0 .../turndown-plugin-gfm/config/rollup.config.js | 0 .../turndown-plugin-gfm/package-lock.json | 0 .../packages => packages}/turndown-plugin-gfm/package.json | 2 +- .../packages => packages}/turndown-plugin-gfm/publish.sh | 0 .../packages => packages}/turndown-plugin-gfm/src/gfm.js | 0 .../turndown-plugin-gfm/src/highlighted-code-block.js | 0 .../turndown-plugin-gfm/src/strikethrough.js | 0 .../turndown-plugin-gfm/src/tables.js | 0 .../turndown-plugin-gfm/src/task-list-items.js | 0 .../turndown-plugin-gfm/test/index.html | 0 .../turndown-plugin-gfm/test/turndown-plugin-gfm-test.js | 0 23 files changed, 4 insertions(+), 7 deletions(-) rename {_regroup/packages => packages}/turndown-plugin-gfm/.gitignore (100%) rename {_regroup/packages => packages}/turndown-plugin-gfm/.travis.yml (100%) rename {_regroup/packages => packages}/turndown-plugin-gfm/LICENSE (100%) rename {_regroup/packages => packages}/turndown-plugin-gfm/README.md (100%) rename {_regroup/packages => packages}/turndown-plugin-gfm/build_for_test.sh (100%) rename {_regroup/packages => packages}/turndown-plugin-gfm/config/rollup.config.browser.cjs.js (100%) rename {_regroup/packages => packages}/turndown-plugin-gfm/config/rollup.config.browser.es.js (100%) rename {_regroup/packages => packages}/turndown-plugin-gfm/config/rollup.config.cjs.js (100%) rename {_regroup/packages => packages}/turndown-plugin-gfm/config/rollup.config.es.js (100%) rename {_regroup/packages => packages}/turndown-plugin-gfm/config/rollup.config.iife.js (100%) rename {_regroup/packages => packages}/turndown-plugin-gfm/config/rollup.config.js (100%) rename {_regroup/packages => packages}/turndown-plugin-gfm/package-lock.json (100%) rename {_regroup/packages => packages}/turndown-plugin-gfm/package.json (96%) rename {_regroup/packages => packages}/turndown-plugin-gfm/publish.sh (100%) rename {_regroup/packages => packages}/turndown-plugin-gfm/src/gfm.js (100%) rename {_regroup/packages => packages}/turndown-plugin-gfm/src/highlighted-code-block.js (100%) rename {_regroup/packages => packages}/turndown-plugin-gfm/src/strikethrough.js (100%) rename {_regroup/packages => packages}/turndown-plugin-gfm/src/tables.js (100%) rename {_regroup/packages => packages}/turndown-plugin-gfm/src/task-list-items.js (100%) rename {_regroup/packages => packages}/turndown-plugin-gfm/test/index.html (100%) rename {_regroup/packages => packages}/turndown-plugin-gfm/test/turndown-plugin-gfm-test.js (100%) diff --git a/apps/server/src/services/export/markdown.ts b/apps/server/src/services/export/markdown.ts index 840e8b198..f68a8d87e 100644 --- a/apps/server/src/services/export/markdown.ts +++ b/apps/server/src/services/export/markdown.ts @@ -1,7 +1,7 @@ "use strict"; import TurndownService, { type Rule } from "turndown"; -import { gfm } from "../../../packages/turndown-plugin-gfm/src/gfm.js"; +import { gfm } from "@triliumnext/turndown-plugin-gfm"; let instance: TurndownService | null = null; diff --git a/apps/server/src/types.d.ts b/apps/server/src/types.d.ts index 671408321..8c50ff34c 100644 --- a/apps/server/src/types.d.ts +++ b/apps/server/src/types.d.ts @@ -18,12 +18,9 @@ declare module "normalize-strings" { export default normalizeString; } -declare module "@joplin/turndown-plugin-gfm" { +declare module "@triliumnext/turndown-plugin-gfm" { import TurndownService from "turndown"; - namespace gfm { - function gfm(service: TurndownService): void; - } - export default gfm; + export function gfm(service: TurndownService): void; } declare module "is-animated" { diff --git a/_regroup/packages/turndown-plugin-gfm/.gitignore b/packages/turndown-plugin-gfm/.gitignore similarity index 100% rename from _regroup/packages/turndown-plugin-gfm/.gitignore rename to packages/turndown-plugin-gfm/.gitignore diff --git a/_regroup/packages/turndown-plugin-gfm/.travis.yml b/packages/turndown-plugin-gfm/.travis.yml similarity index 100% rename from _regroup/packages/turndown-plugin-gfm/.travis.yml rename to packages/turndown-plugin-gfm/.travis.yml diff --git a/_regroup/packages/turndown-plugin-gfm/LICENSE b/packages/turndown-plugin-gfm/LICENSE similarity index 100% rename from _regroup/packages/turndown-plugin-gfm/LICENSE rename to packages/turndown-plugin-gfm/LICENSE diff --git a/_regroup/packages/turndown-plugin-gfm/README.md b/packages/turndown-plugin-gfm/README.md similarity index 100% rename from _regroup/packages/turndown-plugin-gfm/README.md rename to packages/turndown-plugin-gfm/README.md diff --git a/_regroup/packages/turndown-plugin-gfm/build_for_test.sh b/packages/turndown-plugin-gfm/build_for_test.sh similarity index 100% rename from _regroup/packages/turndown-plugin-gfm/build_for_test.sh rename to packages/turndown-plugin-gfm/build_for_test.sh diff --git a/_regroup/packages/turndown-plugin-gfm/config/rollup.config.browser.cjs.js b/packages/turndown-plugin-gfm/config/rollup.config.browser.cjs.js similarity index 100% rename from _regroup/packages/turndown-plugin-gfm/config/rollup.config.browser.cjs.js rename to packages/turndown-plugin-gfm/config/rollup.config.browser.cjs.js diff --git a/_regroup/packages/turndown-plugin-gfm/config/rollup.config.browser.es.js b/packages/turndown-plugin-gfm/config/rollup.config.browser.es.js similarity index 100% rename from _regroup/packages/turndown-plugin-gfm/config/rollup.config.browser.es.js rename to packages/turndown-plugin-gfm/config/rollup.config.browser.es.js diff --git a/_regroup/packages/turndown-plugin-gfm/config/rollup.config.cjs.js b/packages/turndown-plugin-gfm/config/rollup.config.cjs.js similarity index 100% rename from _regroup/packages/turndown-plugin-gfm/config/rollup.config.cjs.js rename to packages/turndown-plugin-gfm/config/rollup.config.cjs.js diff --git a/_regroup/packages/turndown-plugin-gfm/config/rollup.config.es.js b/packages/turndown-plugin-gfm/config/rollup.config.es.js similarity index 100% rename from _regroup/packages/turndown-plugin-gfm/config/rollup.config.es.js rename to packages/turndown-plugin-gfm/config/rollup.config.es.js diff --git a/_regroup/packages/turndown-plugin-gfm/config/rollup.config.iife.js b/packages/turndown-plugin-gfm/config/rollup.config.iife.js similarity index 100% rename from _regroup/packages/turndown-plugin-gfm/config/rollup.config.iife.js rename to packages/turndown-plugin-gfm/config/rollup.config.iife.js diff --git a/_regroup/packages/turndown-plugin-gfm/config/rollup.config.js b/packages/turndown-plugin-gfm/config/rollup.config.js similarity index 100% rename from _regroup/packages/turndown-plugin-gfm/config/rollup.config.js rename to packages/turndown-plugin-gfm/config/rollup.config.js diff --git a/_regroup/packages/turndown-plugin-gfm/package-lock.json b/packages/turndown-plugin-gfm/package-lock.json similarity index 100% rename from _regroup/packages/turndown-plugin-gfm/package-lock.json rename to packages/turndown-plugin-gfm/package-lock.json diff --git a/_regroup/packages/turndown-plugin-gfm/package.json b/packages/turndown-plugin-gfm/package.json similarity index 96% rename from _regroup/packages/turndown-plugin-gfm/package.json rename to packages/turndown-plugin-gfm/package.json index b8f052497..23eab25d3 100644 --- a/_regroup/packages/turndown-plugin-gfm/package.json +++ b/packages/turndown-plugin-gfm/package.json @@ -1,5 +1,5 @@ { - "name": "@joplin/turndown-plugin-gfm", + "name": "@triliumnext/turndown-plugin-gfm", "description": "Turndown plugin to add GitHub Flavored Markdown extensions.", "publishConfig": { "access": "public" diff --git a/_regroup/packages/turndown-plugin-gfm/publish.sh b/packages/turndown-plugin-gfm/publish.sh similarity index 100% rename from _regroup/packages/turndown-plugin-gfm/publish.sh rename to packages/turndown-plugin-gfm/publish.sh diff --git a/_regroup/packages/turndown-plugin-gfm/src/gfm.js b/packages/turndown-plugin-gfm/src/gfm.js similarity index 100% rename from _regroup/packages/turndown-plugin-gfm/src/gfm.js rename to packages/turndown-plugin-gfm/src/gfm.js diff --git a/_regroup/packages/turndown-plugin-gfm/src/highlighted-code-block.js b/packages/turndown-plugin-gfm/src/highlighted-code-block.js similarity index 100% rename from _regroup/packages/turndown-plugin-gfm/src/highlighted-code-block.js rename to packages/turndown-plugin-gfm/src/highlighted-code-block.js diff --git a/_regroup/packages/turndown-plugin-gfm/src/strikethrough.js b/packages/turndown-plugin-gfm/src/strikethrough.js similarity index 100% rename from _regroup/packages/turndown-plugin-gfm/src/strikethrough.js rename to packages/turndown-plugin-gfm/src/strikethrough.js diff --git a/_regroup/packages/turndown-plugin-gfm/src/tables.js b/packages/turndown-plugin-gfm/src/tables.js similarity index 100% rename from _regroup/packages/turndown-plugin-gfm/src/tables.js rename to packages/turndown-plugin-gfm/src/tables.js diff --git a/_regroup/packages/turndown-plugin-gfm/src/task-list-items.js b/packages/turndown-plugin-gfm/src/task-list-items.js similarity index 100% rename from _regroup/packages/turndown-plugin-gfm/src/task-list-items.js rename to packages/turndown-plugin-gfm/src/task-list-items.js diff --git a/_regroup/packages/turndown-plugin-gfm/test/index.html b/packages/turndown-plugin-gfm/test/index.html similarity index 100% rename from _regroup/packages/turndown-plugin-gfm/test/index.html rename to packages/turndown-plugin-gfm/test/index.html diff --git a/_regroup/packages/turndown-plugin-gfm/test/turndown-plugin-gfm-test.js b/packages/turndown-plugin-gfm/test/turndown-plugin-gfm-test.js similarity index 100% rename from _regroup/packages/turndown-plugin-gfm/test/turndown-plugin-gfm-test.js rename to packages/turndown-plugin-gfm/test/turndown-plugin-gfm-test.js