From 3df195aac14949fb404d4d8ed8f0da876049c12d Mon Sep 17 00:00:00 2001 From: Elian Doran Date: Fri, 18 Apr 2025 19:26:43 +0300 Subject: [PATCH] fix(monorepo/server): dist not running due to gfm package --- apps/server/scripts/copy-dist.ts | 1 - apps/server/src/services/export/markdown.ts | 2 +- apps/server/tsconfig.json | 2 +- .../config/rollup.config.browser.cjs.js | 8 -------- .../config/rollup.config.browser.es.js | 8 -------- packages/turndown-plugin-gfm/config/rollup.config.cjs.js | 8 -------- packages/turndown-plugin-gfm/config/rollup.config.es.js | 8 -------- .../turndown-plugin-gfm/config/rollup.config.iife.js | 9 --------- packages/turndown-plugin-gfm/config/rollup.config.js | 6 ------ packages/turndown-plugin-gfm/package.json | 7 +------ 10 files changed, 3 insertions(+), 56 deletions(-) delete mode 100644 packages/turndown-plugin-gfm/config/rollup.config.browser.cjs.js delete mode 100644 packages/turndown-plugin-gfm/config/rollup.config.browser.es.js delete mode 100644 packages/turndown-plugin-gfm/config/rollup.config.cjs.js delete mode 100644 packages/turndown-plugin-gfm/config/rollup.config.es.js delete mode 100644 packages/turndown-plugin-gfm/config/rollup.config.iife.js delete mode 100644 packages/turndown-plugin-gfm/config/rollup.config.js diff --git a/apps/server/scripts/copy-dist.ts b/apps/server/scripts/copy-dist.ts index a834b785d..69f3c84e3 100644 --- a/apps/server/scripts/copy-dist.ts +++ b/apps/server/scripts/copy-dist.ts @@ -71,7 +71,6 @@ try { fs.copySync(dir, path.normalize(path.join(PUBLIC_DIR, path.basename(dir)))); } - fs.copySync(path.join(serverDir, "build-ts", "apps", "server", "src"), path.join(DEST_DIR, "src")); fs.copySync(path.join(rootDir, "packages", "turndown-plugin-gfm", "src"), path.join(DEST_DIR, "src", "public", "app-dist", "turndown-plugin-gfm")); console.log("Copying complete!") diff --git a/apps/server/src/services/export/markdown.ts b/apps/server/src/services/export/markdown.ts index 6f06b81c3..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/tsconfig.json b/apps/server/tsconfig.json index e330fabae..29873d452 100644 --- a/apps/server/tsconfig.json +++ b/apps/server/tsconfig.json @@ -3,7 +3,7 @@ "module": "NodeNext", "declaration": false, "sourceMap": true, - "outDir": "./build-ts", + "outDir": "./build", "strict": true, "noImplicitAny": true, "resolveJsonModule": true, diff --git a/packages/turndown-plugin-gfm/config/rollup.config.browser.cjs.js b/packages/turndown-plugin-gfm/config/rollup.config.browser.cjs.js deleted file mode 100644 index 1c9a5fd46..000000000 --- a/packages/turndown-plugin-gfm/config/rollup.config.browser.cjs.js +++ /dev/null @@ -1,8 +0,0 @@ -import config from './rollup.config.js'; - -export default config({ - output: { - format: 'cjs', - file: 'lib/turndown-plugin-gfm.browser.cjs.js', - }, -}); diff --git a/packages/turndown-plugin-gfm/config/rollup.config.browser.es.js b/packages/turndown-plugin-gfm/config/rollup.config.browser.es.js deleted file mode 100644 index f7c7a4763..000000000 --- a/packages/turndown-plugin-gfm/config/rollup.config.browser.es.js +++ /dev/null @@ -1,8 +0,0 @@ -import config from './rollup.config.js'; - -export default config({ - output: { - format: 'es', - file: 'lib/turndown-plugin-gfm.browser.es.js', - }, -}); diff --git a/packages/turndown-plugin-gfm/config/rollup.config.cjs.js b/packages/turndown-plugin-gfm/config/rollup.config.cjs.js deleted file mode 100644 index 5641843c2..000000000 --- a/packages/turndown-plugin-gfm/config/rollup.config.cjs.js +++ /dev/null @@ -1,8 +0,0 @@ -import config from './rollup.config.js'; - -export default config({ - output: { - format: 'cjs', - file: 'lib/turndown-plugin-gfm.cjs.js', - }, -}); diff --git a/packages/turndown-plugin-gfm/config/rollup.config.es.js b/packages/turndown-plugin-gfm/config/rollup.config.es.js deleted file mode 100644 index b56580cff..000000000 --- a/packages/turndown-plugin-gfm/config/rollup.config.es.js +++ /dev/null @@ -1,8 +0,0 @@ -import config from './rollup.config.js'; - -export default config({ - output: { - format: 'es', - file: 'lib/turndown-plugin-gfm.es.js', - }, -}); diff --git a/packages/turndown-plugin-gfm/config/rollup.config.iife.js b/packages/turndown-plugin-gfm/config/rollup.config.iife.js deleted file mode 100644 index 41bc20f75..000000000 --- a/packages/turndown-plugin-gfm/config/rollup.config.iife.js +++ /dev/null @@ -1,9 +0,0 @@ -import config from './rollup.config.js'; - -export default config({ - output: { - format: 'iife', - file: 'dist/turndown-plugin-gfm.js', - name: 'turndownPluginGfm' - }, -}); diff --git a/packages/turndown-plugin-gfm/config/rollup.config.js b/packages/turndown-plugin-gfm/config/rollup.config.js deleted file mode 100644 index c1ab51777..000000000 --- a/packages/turndown-plugin-gfm/config/rollup.config.js +++ /dev/null @@ -1,6 +0,0 @@ -export default function(config) { - return { - input: 'src/gfm.js', - output: config.output, - }; -} diff --git a/packages/turndown-plugin-gfm/package.json b/packages/turndown-plugin-gfm/package.json index f56a2d538..a92693b0d 100644 --- a/packages/turndown-plugin-gfm/package.json +++ b/packages/turndown-plugin-gfm/package.json @@ -6,7 +6,7 @@ }, "version": "1.0.61", "author": "Dom Christie", - "main": "lib/turndown-plugin-gfm.cjs.js", + "main": "src/gfm.js", "devDependencies": { "browserify": "^17.0.1", "rollup": "^4.36.0", @@ -34,11 +34,6 @@ }, "type": "module", "scripts": { - "build-all": "npm run build-cjs && npm run build-es && npm run build-iife", - "build": "rollup -c config/rollup.config.cjs.js", - "build-cjs": "rollup -c config/rollup.config.cjs.js && rollup -c config/rollup.config.browser.cjs.js", - "build-es": "rollup -c config/rollup.config.es.js && rollup -c config/rollup.config.browser.es.js", - "build-iife": "rollup -c config/rollup.config.iife.js", "build-test": "browserify test/turndown-plugin-gfm-test.js --outfile test/turndown-plugin-gfm-test.browser.js" }, "gitHead": "05a29b450962bf05a8642bbd39446a1f679a96ba"