mirror of
				https://github.com/zadam/trilium.git
				synced 2025-10-30 18:05:55 +01:00 
			
		
		
		
	chore(ckeditor5): integrate keyboard-marker
This commit is contained in:
		| @@ -41,7 +41,7 @@ | |||||||
|     "@vitest/browser": "^2.0.5", |     "@vitest/browser": "^2.0.5", | ||||||
|     "@vitest/coverage-istanbul": "^2.0.5", |     "@vitest/coverage-istanbul": "^2.0.5", | ||||||
|     "chalk": "5.4.1", |     "chalk": "5.4.1", | ||||||
|     "ckeditor5": "latest", |     "ckeditor5": "43.2.0", | ||||||
|     "eslint": "^7.32.0", |     "eslint": "^7.32.0", | ||||||
|     "eslint-config-ckeditor5": ">=9.1.0", |     "eslint-config-ckeditor5": ">=9.1.0", | ||||||
|     "http-server": "^14.1.0", |     "http-server": "^14.1.0", | ||||||
| @@ -57,7 +57,7 @@ | |||||||
|     "webdriverio": "^9.0.7" |     "webdriverio": "^9.0.7" | ||||||
|   }, |   }, | ||||||
|   "peerDependencies": { |   "peerDependencies": { | ||||||
|     "ckeditor5": ">=42.0.0 || ^0.0.0-nightly" |     "ckeditor5": "43.2.0" | ||||||
|   }, |   }, | ||||||
|   "scripts": { |   "scripts": { | ||||||
|     "build:dist": "node ./scripts/build-dist.mjs", |     "build:dist": "node ./scripts/build-dist.mjs", | ||||||
|   | |||||||
| @@ -19,7 +19,8 @@ | |||||||
|     "name": "ckeditor5" |     "name": "ckeditor5" | ||||||
|   }, |   }, | ||||||
|   "dependencies": { |   "dependencies": { | ||||||
|     "ckeditor5": "43.2.0" |     "ckeditor5": "43.2.0", | ||||||
|  |     "@triliumnext/ckeditor5-keyboard-marker": "workspace:*" | ||||||
|   }, |   }, | ||||||
|   "devDependencies": { |   "devDependencies": { | ||||||
|     "@types/jquery": "3.5.32" |     "@types/jquery": "3.5.32" | ||||||
|   | |||||||
| @@ -13,6 +13,7 @@ import MarkdownImportPlugin from "./plugins/markdownimport.js"; | |||||||
| import MentionCustomization from "./plugins/mention_customization.js"; | import MentionCustomization from "./plugins/mention_customization.js"; | ||||||
| import IncludeNote from "./plugins/includenote.js"; | import IncludeNote from "./plugins/includenote.js"; | ||||||
| import Uploadfileplugin from "./plugins/file_upload/uploadfileplugin.js"; | import Uploadfileplugin from "./plugins/file_upload/uploadfileplugin.js"; | ||||||
|  | import { Kbd } from "@triliumnext/ckeditor5-keyboard-marker"; | ||||||
|  |  | ||||||
| const TRILIUM_PLUGINS: typeof Plugin[] = [ | const TRILIUM_PLUGINS: typeof Plugin[] = [ | ||||||
|     CutToNotePlugin, |     CutToNotePlugin, | ||||||
| @@ -30,8 +31,13 @@ const TRILIUM_PLUGINS: typeof Plugin[] = [ | |||||||
|     Uploadfileplugin |     Uploadfileplugin | ||||||
| ]; | ]; | ||||||
|  |  | ||||||
|  | const EXTERNAL_PLUGINS: typeof Plugin[] = [ | ||||||
|  |     Kbd | ||||||
|  | ]; | ||||||
|  |  | ||||||
| export const COMMON_PLUGINS: typeof Plugin[] = [ | export const COMMON_PLUGINS: typeof Plugin[] = [ | ||||||
|     ...TRILIUM_PLUGINS, |     ...TRILIUM_PLUGINS, | ||||||
|  |     ...EXTERNAL_PLUGINS, | ||||||
|  |  | ||||||
| 	// essentials package expanded to allow selectively disable Enter and ShiftEnter | 	// essentials package expanded to allow selectively disable Enter and ShiftEnter | ||||||
| 	Clipboard, Enter, SelectAll, ShiftEnter, Typing, Undo, | 	Clipboard, Enter, SelectAll, ShiftEnter, Typing, Undo, | ||||||
| @@ -94,7 +100,6 @@ export const COMMON_PLUGINS: typeof Plugin[] = [ | |||||||
| 	// AutoformatMath, | 	// AutoformatMath, | ||||||
| 	// Footnotes, | 	// Footnotes, | ||||||
| 	// Mermaid, | 	// Mermaid, | ||||||
| 	// Kbd, |  | ||||||
| 	// Admonition | 	// Admonition | ||||||
| ]; | ]; | ||||||
|  |  | ||||||
|   | |||||||
| @@ -18,5 +18,9 @@ | |||||||
|   "include": [ |   "include": [ | ||||||
|     "src/**/*.ts" |     "src/**/*.ts" | ||||||
|   ], |   ], | ||||||
|   "references": [] |   "references": [ | ||||||
|  |     { | ||||||
|  |       "path": "../ckeditor5-keyboard-marker" | ||||||
|  |     } | ||||||
|  |   ] | ||||||
| } | } | ||||||
|   | |||||||
							
								
								
									
										1857
									
								
								pnpm-lock.yaml
									
									
									
										generated
									
									
									
								
							
							
						
						
									
										1857
									
								
								pnpm-lock.yaml
									
									
									
										generated
									
									
									
								
							
										
											
												File diff suppressed because it is too large
												Load Diff
											
										
									
								
							| @@ -12,9 +12,6 @@ | |||||||
|     { |     { | ||||||
|       "path": "./apps/server" |       "path": "./apps/server" | ||||||
|     }, |     }, | ||||||
|     { |  | ||||||
|       "path": "./packages/turndown-plugin-gfm" |  | ||||||
|     }, |  | ||||||
|     { |     { | ||||||
|       "path": "./apps/server-e2e" |       "path": "./apps/server-e2e" | ||||||
|     }, |     }, | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user