From 8a3b6ea69434aff6a77ea581f356e6ce0b4d1754 Mon Sep 17 00:00:00 2001 From: Elian Doran Date: Tue, 21 Oct 2025 17:57:12 +0300 Subject: [PATCH] chore(split): wire into monorepo --- apps/client/package.json | 2 +- apps/client/src/services/resizer.ts | 4 ++-- .../abstract_split_type_widget.ts | 2 +- packages/splitjs/package.json | 6 ++---- pnpm-lock.yaml | 19 +++++++++---------- 5 files changed, 15 insertions(+), 18 deletions(-) diff --git a/apps/client/package.json b/apps/client/package.json index d2a72201a..c2490ebfd 100644 --- a/apps/client/package.json +++ b/apps/client/package.json @@ -32,6 +32,7 @@ "@triliumnext/commons": "workspace:*", "@triliumnext/highlightjs": "workspace:*", "@triliumnext/share-theme": "workspace:*", + "@triliumnext/split.js": "workspace:*", "autocomplete.js": "0.38.1", "bootstrap": "5.3.8", "boxicons": "2.1.4", @@ -60,7 +61,6 @@ "preact": "10.27.2", "react-i18next": "16.1.2", "reveal.js": "5.2.1", - "split.js": "1.6.5", "svg-pan-zoom": "3.6.2", "tabulator-tables": "6.3.1", "vanilla-js-wheel-zoom": "9.0.4" diff --git a/apps/client/src/services/resizer.ts b/apps/client/src/services/resizer.ts index 54a11e801..874cf8cf9 100644 --- a/apps/client/src/services/resizer.ts +++ b/apps/client/src/services/resizer.ts @@ -1,5 +1,5 @@ import options from "./options.js"; -import Split from "split.js" +import Split from "@triliumnext/split.js"; export const DEFAULT_GUTTER_SIZE = 5; @@ -99,7 +99,7 @@ function setupNoteSplitResizer(ntxIds: string[]) { let targetNtxIds: string[] | undefined; for (const ntxId of ntxIds) { targetNtxIds = findKeyByNtxId(ntxId); - if (targetNtxIds) break; + if (targetNtxIds) break; } if (targetNtxIds) { diff --git a/apps/client/src/widgets/type_widgets/abstract_split_type_widget.ts b/apps/client/src/widgets/type_widgets/abstract_split_type_widget.ts index 563f7671b..f9a2be11a 100644 --- a/apps/client/src/widgets/type_widgets/abstract_split_type_widget.ts +++ b/apps/client/src/widgets/type_widgets/abstract_split_type_widget.ts @@ -2,7 +2,7 @@ import type FNote from "../../entities/fnote.js"; import utils from "../../services/utils.js"; import EditableCodeTypeWidget from "./editable_code.js"; import TypeWidget from "./type_widget.js"; -import Split from "split.js"; +import Split from "@triliumnext/split.js"; import { DEFAULT_GUTTER_SIZE } from "../../services/resizer.js"; import options from "../../services/options.js"; import type { EventData } from "../../components/app_context.js"; diff --git a/packages/splitjs/package.json b/packages/splitjs/package.json index 0f01734fa..e3bf2676b 100644 --- a/packages/splitjs/package.json +++ b/packages/splitjs/package.json @@ -1,10 +1,8 @@ { - "name": "split.js", + "name": "@triliumnext/split.js", "version": "1.6.5", "description": "2kb unopinionated utility for resizeable split views", - "main": "dist/split.js", - "minified:main": "dist/split.min.js", - "module": "dist/split.es.js", + "main": "src/split.js", "types": "index.d.ts", "repository": "https://github.com/nathancahill/split", "keywords": [ diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 75433d2ce..3f7f61334 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -175,6 +175,9 @@ importers: '@triliumnext/share-theme': specifier: workspace:* version: link:../../packages/share-theme + '@triliumnext/split.js': + specifier: workspace:* + version: link:../../packages/splitjs autocomplete.js: specifier: 0.38.1 version: 0.38.1 @@ -259,9 +262,6 @@ importers: reveal.js: specifier: 5.2.1 version: 5.2.1 - split.js: - specifier: 1.6.5 - version: 1.6.5 svg-pan-zoom: specifier: 3.6.2 version: 3.6.2 @@ -1354,6 +1354,8 @@ importers: specifier: 5.9.3 version: 5.9.3 + packages/splitjs: {} + packages/turndown-plugin-gfm: devDependencies: turndown: @@ -12506,9 +12508,6 @@ packages: resolution: {integrity: sha512-43ZssAJaMusuKWL8sKUBQXHWOpq8d6CfN/u1p4gUzfJkM05C8rxTmYrkIPTXapZpORA6LkkzcUulJ8FqA7Uudw==} engines: {node: '>=6'} - split.js@1.6.5: - resolution: {integrity: sha512-mPTnGCiS/RiuTNsVhCm9De9cCAUsrNFFviRbADdKiiV+Kk8HKp/0fWu7Kr8pi3/yBmsqLFHuXGT9UUZ+CNLwFw==} - split2@4.2.0: resolution: {integrity: sha512-UcjcJOWknrNkF6PLX83qcHM6KHgVKNkV62Y8a5uYDVv9ydGQVwAHMKqHdJje1VTWpljG0WYpCDhrCdAOYH4TWg==} engines: {node: '>= 10.x'} @@ -14869,6 +14868,8 @@ snapshots: '@ckeditor/ckeditor5-core': 47.1.0 '@ckeditor/ckeditor5-utils': 47.1.0 ckeditor5: 47.1.0(patch_hash=8331a09d41443b39ea1c784daaccfeb0da4f9065ed556e7de92e9c77edd9eb41) + transitivePeerDependencies: + - supports-color '@ckeditor/ckeditor5-code-block@47.1.0(patch_hash=2361d8caad7d6b5bddacc3a3b4aa37dbfba260b1c1b22a450413a79c1bb1ce95)': dependencies: @@ -14930,8 +14931,6 @@ snapshots: '@ckeditor/ckeditor5-utils': 47.1.0 '@ckeditor/ckeditor5-watchdog': 47.1.0 es-toolkit: 1.39.5 - transitivePeerDependencies: - - supports-color '@ckeditor/ckeditor5-dev-build-tools@43.1.0(@swc/helpers@0.5.17)(tslib@2.8.1)(typescript@5.9.3)': dependencies: @@ -15145,6 +15144,8 @@ snapshots: '@ckeditor/ckeditor5-table': 47.1.0 '@ckeditor/ckeditor5-utils': 47.1.0 ckeditor5: 47.1.0(patch_hash=8331a09d41443b39ea1c784daaccfeb0da4f9065ed556e7de92e9c77edd9eb41) + transitivePeerDependencies: + - supports-color '@ckeditor/ckeditor5-emoji@47.1.0': dependencies: @@ -28663,8 +28664,6 @@ snapshots: split-on-first@1.1.0: {} - split.js@1.6.5: {} - split2@4.2.0: {} sprintf-js@1.0.3: {}