mirror of
				https://github.com/zadam/trilium.git
				synced 2025-10-31 10:26:08 +01:00 
			
		
		
		
	fix(client): integrate highlight.js (partially)
This commit is contained in:
		| @@ -18,6 +18,7 @@ | ||||
|     "@fullcalendar/list": "6.1.17", | ||||
|     "@fullcalendar/multimonth": "6.1.17", | ||||
|     "@fullcalendar/timegrid": "6.1.17", | ||||
|     "@highlightjs/cdn-assets": "11.11.1", | ||||
|     "@mermaid-js/layout-elk": "0.1.7", | ||||
|     "@mind-elixir/node-menu": "1.0.5", | ||||
|     "@popperjs/core": "2.11.8", | ||||
|   | ||||
| @@ -6,8 +6,7 @@ | ||||
|   "dependencies": { | ||||
|     "better-sqlite3": "11.10.0", | ||||
|     "jquery.fancytree": "2.38.5", | ||||
|     "jquery-hotkeys": "0.2.2", | ||||
|     "@highlightjs/cdn-assets": "11.11.1" | ||||
|     "jquery-hotkeys": "0.2.2" | ||||
|   }, | ||||
|   "devDependencies": { | ||||
|     "@electron/remote": "2.1.2", | ||||
|   | ||||
| @@ -65,8 +65,6 @@ async function register(app: express.Application) { | ||||
|     app.use(`/${assetPath}/node_modules/normalize.css/`, persistentCacheStatic(path.join(nodeModulesDir, "normalize.css/"))); | ||||
|  | ||||
|     app.use(`/${assetPath}/node_modules/jquery.fancytree/dist/`, persistentCacheStatic(path.join(nodeModulesDir, "jquery.fancytree/dist/"))); | ||||
|  | ||||
|     app.use(`/${assetPath}/node_modules/@highlightjs/cdn-assets/`, persistentCacheStatic(path.join(nodeModulesDir, "@highlightjs/cdn-assets/"))); | ||||
| } | ||||
|  | ||||
| export default { | ||||
|   | ||||
| @@ -19,7 +19,6 @@ function buildFilesToCopy() { | ||||
|     "jquery-hotkeys", | ||||
|     "normalize.css/normalize.css", | ||||
|     "jquery.fancytree/dist", | ||||
|     "@highlightjs/cdn-assets", | ||||
|  | ||||
|     // Required as they are native dependencies and cannot be well bundled. | ||||
|     "better-sqlite3", | ||||
|   | ||||
							
								
								
									
										6
									
								
								pnpm-lock.yaml
									
									
									
										generated
									
									
									
								
							
							
						
						
									
										6
									
								
								pnpm-lock.yaml
									
									
									
										generated
									
									
									
								
							| @@ -191,6 +191,9 @@ importers: | ||||
|       '@fullcalendar/timegrid': | ||||
|         specifier: 6.1.17 | ||||
|         version: 6.1.17(@fullcalendar/core@6.1.17) | ||||
|       '@highlightjs/cdn-assets': | ||||
|         specifier: 11.11.1 | ||||
|         version: 11.11.1 | ||||
|       '@mermaid-js/layout-elk': | ||||
|         specifier: 0.1.7 | ||||
|         version: 0.1.7(mermaid@11.6.0) | ||||
| @@ -472,9 +475,6 @@ importers: | ||||
|  | ||||
|   apps/server: | ||||
|     dependencies: | ||||
|       '@highlightjs/cdn-assets': | ||||
|         specifier: 11.11.1 | ||||
|         version: 11.11.1 | ||||
|       better-sqlite3: | ||||
|         specifier: 11.10.0 | ||||
|         version: 11.10.0 | ||||
|   | ||||
		Reference in New Issue
	
	Block a user