refactor(client,server): remove redundant libraries directory

Author: eliandoran

_regroup/eslint.config.js

@@ -44,7 +44,6 @@ export default tseslint.config(
             "dist/*",
             "docs/*",
             "demo/*",
-            "libraries/*",
             "src/public/app-dist/*",
             "src/public/app/doc_notes/*"
         ]

_regroup/eslint.format.config.js

@@ -38,7 +38,6 @@ export default [
             "dist/*",
             "docs/*",
             "demo/*",
-            "libraries/*",
             // TriliumNextTODO: check if we want to format packages here as well - for now skipping it
             "packages/*",
             "src/public/app-dist/*",

apps/client/src/libraries/codemirror/hcl.js

@@ -5,7 +5,7 @@ import { viteStaticCopy } from 'vite-plugin-static-copy'
 import asset_path from './src/asset_path';
 import webpackStatsPlugin from 'rollup-plugin-webpack-stats';
 
-const assets = [ "assets", "stylesheets", "libraries", "fonts", "translations" ];
+const assets = [ "assets", "stylesheets", "fonts", "translations" ];
 
 export default defineConfig(() => ({
     root: __dirname,

apps/client/vite.config.mts

@@ -36,7 +36,6 @@ async function register(app: express.Application) {
 
         app.use(`/${assetUrlFragment}/src`, persistentCacheStatic(path.join(publicDir, "src")));
         app.use(`/${assetUrlFragment}/stylesheets`, persistentCacheStatic(path.join(publicDir, "stylesheets")));
-        app.use(`/${assetUrlFragment}/libraries`, persistentCacheStatic(path.join(publicDir, "libraries")));
         app.use(`/${assetUrlFragment}/fonts`, persistentCacheStatic(path.join(publicDir, "fonts")));
         app.use(`/${assetUrlFragment}/translations/`, persistentCacheStatic(path.join(publicDir, "translations")));
         app.use(`/node_modules/`, persistentCacheStatic(path.join(publicDir, "node_modules")));
@@ -46,8 +45,6 @@ async function register(app: express.Application) {
     app.use(`/assets/vX/fonts`, express.static(path.join(srcRoot, "public/fonts")));
     app.use(`/assets/vX/images`, express.static(path.join(srcRoot, "..", "images")));
     app.use(`/assets/vX/stylesheets`, express.static(path.join(srcRoot, "public/stylesheets")));
-    app.use(`/${assetUrlFragment}/libraries`, persistentCacheStatic(path.join(srcRoot, "public/libraries")));
-    app.use(`/assets/vX/libraries`, express.static(path.join(srcRoot, "..", "libraries")));
 }
 
 export default {

apps/server/src/routes/assets.ts

@@ -73,7 +73,7 @@ function error(message: string | Error | unknown) {
     log(`ERROR: ${message}`);
 }
 
-const requestBlacklist = ["/libraries", "/app", "/images", "/stylesheets", "/api/recent-notes"];
+const requestBlacklist = ["/app", "/images", "/stylesheets", "/api/recent-notes"];
 
 function request(req: Request, res: Response, timeMs: number, responseLength: number | string = "?") {
     for (const bl of requestBlacklist) {

apps/server/src/services/log.ts

@@ -9,8 +9,6 @@ export interface MimeTypeDefinition {
     mime: string;
     /** The name of the language/mime type as defined by highlight.js (or one of the aliases), in order to be used for syntax highlighting such as inside code blocks. */
     mdLanguageCode?: string;
-    /** If specified, will load the corresponding highlight file from the given path instead of `node_modules`. */
-    codeMirrorSource?: string;
 }
 
 export interface MimeType extends MimeTypeDefinition {
@@ -43,7 +41,7 @@ export const MIME_TYPES_DICT: readonly MimeTypeDefinition[] = Object.freeze([
     { title: "ASN.1", mime: "text/x-ttcn-asn" },
     { title: "ASP.NET", mime: "application/x-aspx" },
     { title: "Asterisk", mime: "text/x-asterisk" },
-    { title: "Batch file (DOS)", mime: "application/x-bat", highlightJs: "dos", codeMirrorSource: "libraries/codemirror/batch.js" },
+    { title: "Batch file (DOS)", mime: "application/x-bat", highlightJs: "dos" },
     { title: "Brainfuck", mime: "text/x-brainfuck", mdLanguageCode: "brainfuck" },
     { title: "C", mime: "text/x-csrc", mdLanguageCode: "c", default: true },
     { title: "C#", mime: "text/x-csharp", mdLanguageCode: "csharp", default: true },
@@ -174,7 +172,7 @@ export const MIME_TYPES_DICT: readonly MimeTypeDefinition[] = Object.freeze([
     { title: "Swift", mime: "text/x-swift", default: true },
     { title: "SystemVerilog", mime: "text/x-systemverilog" },
     { title: "Tcl", mime: "text/x-tcl", mdLanguageCode: "tcl" },
-    { title: "Terraform (HCL)", mime: "text/x-hcl", highlightJs: "terraform", highlightJsSource: "libraries", codeMirrorSource: "libraries/codemirror/hcl.js" },
+    { title: "Terraform (HCL)", mime: "text/x-hcl", highlightJs: "terraform" },
     { title: "Textile", mime: "text/x-textile" },
     { title: "TiddlyWiki ", mime: "text/x-tiddlywiki" },
     { title: "Tiki wiki", mime: "text/tiki" },