diff --git a/_regroup/eslint.config.js b/_regroup/eslint.config.js index 2f2b2c036..7c906beb2 100644 --- a/_regroup/eslint.config.js +++ b/_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/*" ] diff --git a/_regroup/eslint.format.config.js b/_regroup/eslint.format.config.js index 23fbb6caf..9dbfd78b2 100644 --- a/_regroup/eslint.format.config.js +++ b/_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/*", diff --git a/apps/client/src/libraries/codemirror/hcl.js b/apps/client/src/libraries/codemirror/hcl.js deleted file mode 100644 index 04c0ea749..000000000 --- a/apps/client/src/libraries/codemirror/hcl.js +++ /dev/null @@ -1,204 +0,0 @@ -// Source: https://github.com/codemirror/codemirror5/pull/7080/files - -// CodeMirror, copyright (c) by Marijn Haverbeke and others -// Distributed under an MIT license: https://codemirror.net/5/LICENSE - -(function (mod) { - if (typeof exports == "object" && typeof module == "object") // CommonJS - mod(require("../../lib/codemirror")); - else if (typeof define == "function" && define.amd) // AMD - define(["../../lib/codemirror"], mod); - else // Plain browser env - mod(CodeMirror); -})(function (CodeMirror) { - "use strict"; - - CodeMirror.defineMode("hcl", function (config) { - var indentUnit = config.indentUnit; - - var keywords = { - "resource": true, - "variable": true, - "output": true, - "module": true, - "provider": true, - "data": true, - "locals": true, - "terraform": true, - "if": true, - "else": true, - "for": true, - "foreach": true, - "in": true, - "true": true, - "false": true, - "null": true, - }; - - var atoms = { - "true": true, - "false": true, - "null": true, - }; - - var isOperatorChar = /[+\-*&^%:=<>!|\/]/; - - var curPunc; - - function tokenBase(stream, state) { - var ch = stream.next(); - if (ch == '"' || ch == "'" || ch == "`") { - state.tokenize = tokenString(ch); - return state.tokenize(stream, state); - } - if (/[\d\.]/.test(ch)) { - if (ch == ".") { - stream.match(/^[0-9_]+([eE][\-+]?[0-9_]+)?/); - } else { - stream.match(/^[0-9_]*\.?[0-9_]*([eE][\-+]?[0-9_]+)?/); - } - return "number"; - } - if (/[\[\]{}\(\),;\:\.]/.test(ch)) { - curPunc = ch; - return null; - } - if (ch == "/") { - if (stream.eat("*")) { - state.tokenize = tokenComment; - return tokenComment(stream, state); - } - if (stream.eat("/")) { - stream.skipToEnd(); - return "comment"; - } - } - if (isOperatorChar.test(ch)) { - stream.eatWhile(isOperatorChar); - return "operator"; - } - stream.eatWhile(/[\w\$_\xa1-\uffff]/); - var cur = stream.current(); - if (keywords.propertyIsEnumerable(cur)) { - return "keyword"; - } - if (atoms.propertyIsEnumerable(cur)) return "atom"; - return "variable"; - } - - function tokenString(quote) { - return function (stream, state) { - var escaped = false, - next, - end = false; - while ((next = stream.next()) != null) { - if (next == quote && !escaped) { - end = true; - break; - } - escaped = !escaped && quote != "`" && next == "\\"; - } - if (end || !(escaped || quote == "`")) - state.tokenize = tokenBase; - return "string"; - }; - } - - function tokenComment(stream, state) { - var maybeEnd = false, - ch; - while (ch = stream.next()) { - if (ch == "/" && maybeEnd) { - state.tokenize = tokenBase; - break; - } - maybeEnd = (ch == "*"); - } - return "comment"; - } - - function Context(indented, column, type, align, prev) { - this.indented = indented; - this.column = column; - this.type = type; - this.align = align; - this.prev = prev; - } - function pushContext(state, col, type) { - return state.context = new Context(state.indented, col, type, null, state.context); - } - function popContext(state) { - if (!state.context.prev) return; - var t = state.context.type; - if (t == ")" || t == "]" || t == "}") - state.indented = state.context.indented; - return state.context = state.context.prev; - } - - // Interface - - return { - startState: function (basecolumn) { - return { - tokenize: null, - context: new Context((basecolumn || 0) - indentUnit, 0, "top", false), - indented: 0, - startOfLine: true - }; - }, - - token: function (stream, state) { - var ctx = state.context; - if (stream.sol()) { - if (ctx.align == null) ctx.align = false; - state.indented = stream.indentation(); - state.startOfLine = true; - } - if (stream.eatSpace()) return null; - curPunc = null; - var style = (state.tokenize || tokenBase)(stream, state); - if (style == "comment") return style; - if (ctx.align == null) ctx.align = true; - - if (curPunc == "{") pushContext(state, stream.column(), "}"); - else if (curPunc == "[") pushContext(state, stream.column(), "]"); - else if (curPunc == "(") pushContext(state, stream.column(), ")"); - else if (curPunc == "}" && ctx.type == "}") popContext(state); - else if (curPunc == ctx.type) popContext(state); - state.startOfLine = false; - return style; - }, - - indent: function (state, textAfter) { - if (state.tokenize != tokenBase && state.tokenize != null) return CodeMirror.Pass; - var ctx = state.context, firstChar = textAfter && textAfter.charAt(0); - if (firstChar == "#" || firstChar == ";") return 0; - if (stream.sol()) { - if (ctx.type == "case" && /^(?:case|default)\b/.test(textAfter)) { - state.context.type = "}"; - return ctx.indented; - } - var closing = firstChar == ctx.type; - if (ctx.align) return ctx.column + (closing ? 0 : 1); - else return ctx.indented + (closing ? 0 : indentUnit); - } - }, - - electricChars: "{}):", - closeBrackets: "()[]{}''\"\"``", - fold: "brace", - blockCommentStart: "/*", - blockCommentEnd: "*/", - lineComment: "//" - }; - }); - - CodeMirror.defineMIME("text/x-hcl", "hcl"); - CodeMirror.modeInfo.push({ - ext: [ "hcl " ], - mime: "text/x-hcl", - mode: "hcl", - name: "Terraform (HCL)" - }); - -}); diff --git a/apps/client/vite.config.mts b/apps/client/vite.config.mts index 95bff36e2..adcf750c2 100644 --- a/apps/client/vite.config.mts +++ b/apps/client/vite.config.mts @@ -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, diff --git a/apps/server/src/routes/assets.ts b/apps/server/src/routes/assets.ts index c11742132..d0de552fd 100644 --- a/apps/server/src/routes/assets.ts +++ b/apps/server/src/routes/assets.ts @@ -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 { diff --git a/apps/server/src/services/log.ts b/apps/server/src/services/log.ts index f5598b7f6..4d66a3909 100644 --- a/apps/server/src/services/log.ts +++ b/apps/server/src/services/log.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) { diff --git a/packages/commons/src/lib/mime_type.ts b/packages/commons/src/lib/mime_type.ts index 039201cba..c2b3b2a62 100644 --- a/packages/commons/src/lib/mime_type.ts +++ b/packages/commons/src/lib/mime_type.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" },