mdts 0.8.1 → 0.9.0

package/dist/frontend/markdown.css

@@ -1,10 +1,25 @@
+:root {
+    --markdown-border-color: rgba(0, 0, 0, .12);
+    --markdown-pre-background-color: #f4f5f7;
+    --markdown-code-background-color: #f4f5f7;
+    --markdown-blockquote-color: rgba(0, 0, 0, .24);
+    --markdown-link-color: #1976d2;
+}
+
+[data-theme="dark"] {
+    --markdown-border-color: rgba(255, 255, 255, .12);
+    --markdown-pre-background-color: #161819;
+    --markdown-code-background-color: #161819;
+    --markdown-blockquote-color: rgba(255, 255, 255, .24);
+}
+
 .markdown-body {
     h1 {
         margin: 48px 0 24px;
         padding-bottom: 16px;
         font-weight: 500;
         font-size: 26px;
-        border-bottom: 1px solid rgba(0, 0, 0, .12);
+        border-bottom: 1px solid var(--markdown-border-color);
     }
 
     h2 {
@@ -12,7 +27,7 @@
         padding-bottom: 10px;
         font-weight: 500;
         font-size: 22px;
-        border-bottom: 1px solid rgba(0, 0, 0, .12);
+        border-bottom: 1px solid var(--markdown-border-color);
     }
 
     h3 {
@@ -56,7 +71,7 @@
     hr {
         margin: 48px 0;
         border: 0;
-        border-bottom: 1px solid rgba(0, 0, 0, .12);
+        border-bottom: 1px solid var(--markdown-border-color);
     }
 
     img {
@@ -76,12 +91,12 @@
         }
 
         tr {
-            border-top: 1px solid rgba(0, 0, 0, .12);
+            border-top: 1px solid var(--markdown-border-color);
         }
 
         td, th {
             padding: 6px 12px;
-            border: 1px solid rgba(0, 0, 0, .12);
+            border: 1px solid var(--markdown-border-color);
         }
     }
 
@@ -89,7 +104,7 @@
         padding: 16px;
         overflow: auto;
         font-size: 0.85rem;
-        background-color: #f4f5f7;
+        background-color: var(--markdown-pre-background-color);
 
         code {
             padding: 0;
@@ -105,7 +120,7 @@
         padding: .1em .6em;
         margin: 0;
         font-size: 80%;
-        background-color: #f4f5f7;
+        background-color: var(--markdown-code-background-color);
         border-radius: 2px;
     }
 
@@ -113,8 +128,8 @@
         margin: 24px 0;
         padding: 5px 16px;
         font-size: 14px;
-        color: rgba(0, 0, 0, .24);
-        border-left: 4px solid rgba(0, 0, 0, .12);
+        color: var(--markdown-blockquote-color);
+        border-left: 4px solid var(--markdown-border-color);
 
         blockquote {
             margin: 12px 0;
@@ -126,7 +141,7 @@
     }
 
     a {
-        color: #1976d2;
+        color: var(--markdown-link-color);
         transition: color 0.1s ease-in-out;
 
         &:hover {
@@ -135,40 +150,3 @@
         }
     }
 }
-
-.markdown-body.dark {
-    h1 {
-        border-color: rgba(255, 255, 255, .12);
-    }
-
-    h2 {
-        border-color: rgba(255, 255, 255, .12);
-    }
-
-    table {
-        tr {
-            border-color: rgba(255, 255, 255, .12);
-        }
-
-        td, th {
-            border-color: rgba(255, 255, 255, .12);
-        }
-    }
-
-    pre {
-        background-color: #161819;
-    }
-
-    code {
-        background-color: #161819;
-    }
-
-    blockquote {
-        color: rgba(255, 255, 255, .24);
-        border-color: rgba(255, 255, 255, .12);
-    }
-
-    hr {
-        border-color: rgba(255, 255, 255, .12);
-    }
-}

package/dist/server/routes/filetree.js

@@ -17,11 +17,13 @@ const express_1 = require("express");
 const fs_1 = __importDefault(require("fs"));
 const path_1 = __importDefault(require("path"));
 const simple_git_1 = __importDefault(require("simple-git"));
+const constants_1 = require("../../constants");
 const fileTreeRouter = (directory) => {
     const router = (0, express_1.Router)();
     const git = (0, simple_git_1.default)({ baseDir: directory });
     router.get('/', (req, res) => __awaiter(void 0, void 0, void 0, function* () {
-        const gitStatus = yield git.status();
+        const isRepo = yield git.checkIsRepo();
+        const gitStatus = isRepo ? yield git.status() : null;
         const fileTree = yield getFileTree(directory, '', gitStatus);
         res.json({ fileTree, mountedDirectoryPath: directory });
     }));
@@ -31,12 +33,8 @@ exports.fileTreeRouter = fileTreeRouter;
 const isDotFileOrDirectory = (entryName) => {
     return entryName.startsWith('.');
 };
-const isLibraryDirectory = (entryName) => {
-    const libraryDirs = ['node_modules', 'vendor', 'bundle', 'venv', 'env', 'site-packages'];
-    return libraryDirs.includes(entryName);
-};
 const shouldIncludeEntry = (entry) => {
-    return !isDotFileOrDirectory(entry.name) && !isLibraryDirectory(entry.name);
+    return !isDotFileOrDirectory(entry.name) && !constants_1.EXCLUDED_DIRECTORIES.includes(entry.name);
 };
 const getFileTree = (baseDirectory, currentRelativePath, gitStatus) => __awaiter(void 0, void 0, void 0, function* () {
     const fullPath = path_1.default.join(baseDirectory, currentRelativePath);
@@ -52,10 +50,12 @@ const getFileTree = (baseDirectory, currentRelativePath, gitStatus) => __awaiter
             }
         }
         else if (entry.name.endsWith('.md') || entry.name.endsWith('.markdown')) {
-            const fileStatus = gitStatus.files.find((f) => f.path === entryPath);
             let status = ' ';
-            if (fileStatus) {
-                status = fileStatus.index !== ' ' ? fileStatus.index : fileStatus.working_dir;
+            if (gitStatus) {
+                const fileStatus = gitStatus.files.find((f) => f.path === entryPath);
+                if (fileStatus) {
+                    status = fileStatus.index !== ' ' ? fileStatus.index : fileStatus.working_dir;
+                }
             }
             tree.push({ path: entryPath, status });
         }

package/dist/server/watcher.js

@@ -1,46 +1,13 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.setupWatcher = void 0;
 const chokidar_1 = __importDefault(require("chokidar"));
-const fs = __importStar(require("fs"));
 const ws_1 = require("ws");
 const logger_1 = require("../utils/logger");
+const constants_1 = require("../constants");
 let contentWatcher = null;
 let currentWatchedFile = null;
 const setupWatcher = (directory, server, port) => {
@@ -79,19 +46,18 @@ const handleWebSocketClose = (wss) => {
 const setupDirectoryWatcher = (directory, wss) => {
     try {
         const watcher = chokidar_1.default.watch(directory, {
-            ignored: (watchedFilePath) => {
-                if (watchedFilePath.includes('node_modules')) {
+            ignored: (watchedFilePath, stats) => {
+                if (constants_1.EXCLUDED_DIRECTORIES.some(p => watchedFilePath.includes(`/${p}`))) {
                     return true;
                 }
-                try {
-                    if (fs.statSync(watchedFilePath).isDirectory()) {
-                        return false;
-                    }
+                if (stats) {
+                    return !stats.isDirectory();
                 }
-                catch (_a) {
+                else {
+                    // If stats is undefined, it's a directory that hasn't been scanned yet.
+                    // We want to traverse directories, so don't ignore.
                     return false;
                 }
-                return !isMarkdownOrSimpleAsset(watchedFilePath);
             },
             ignoreInitial: true,
         });
@@ -107,6 +73,15 @@ const setupDirectoryWatcher = (directory, wss) => {
                 client.send(JSON.stringify({ type: 'reload-tree' }));
             });
         });
+        watcher.on('error', (error) => {
+            watcher.unwatch(directory);
+            watcher.close()
+                .then((a) => console.log(a));
+            logger_1.logger.error('🚫 Error watching directory:', error);
+            logger_1.logger.error('Livereload will be disabled');
+            if (error && typeof error === 'object' && 'code' in error && error.code === 'EMFILE')
+                logger_1.logger.error('This error is likely caused by too many open files. Try increasing the ulimit.');
+        });
         return watcher;
     }
     catch (e) {
@@ -130,7 +105,3 @@ const setupContentWatcher = (ws, filePath) => {
         });
     }
 };
-const isMarkdownOrSimpleAsset = (filePath) => {
-    const ext = filePath.toLowerCase().split('.').pop();
-    return !!ext && (ext === 'md' || ext === 'markdown');
-};

package/dist/utils/logger.js

@@ -27,7 +27,7 @@ class Logger {
     error(message, ...args) {
         import('chalk')
             .then((module) => module.default)
-            .then(chalk => { console.error(chalk.bgRed.white(' Error '), message, ...args); });
+            .then(chalk => { console.error(chalk.bgRed.black(' Error'.padEnd(14, ' ')), message, ...args); });
     }
     getTagColor(tag) {
         return import('chalk').then((module) => module.default).then(chalk => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mdts",
-  "version": "0.8.1",
+  "version": "0.9.0",
   "description": "A markdown preview server.",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -15,8 +15,11 @@
     "build:frontend": "cd packages/frontend && npm run build",
     "jest": "node --experimental-vm-modules node_modules/jest/bin/jest.js --config jest.config.js",
     "watch": "npm run jest -- --watch",
+    "watch:frontend": "cd packages/frontend && npm run jest -- --watch",
     "test": "npm run jest -- --selectProjects test",
+    "test:frontend": "cd packages/frontend && npm run jest -- --selectProjects test",
     "lint": "npm run jest -- --selectProjects lint",
+    "lint:frontend": "cd packages/frontend && npm run jest -- --selectProjects lint",
     "start": "npm run build && npm run build:frontend && node dist/index.js",
     "dev": "npm run build && npm run build:frontend && tsc --watch --preserveWatchOutput & cd packages/frontend && npm run build -- --watch & node dist/index.js"
   },
@@ -36,7 +39,7 @@
   "bugs": {
     "url": "https://github.com/unhappychoice/mdts/issues"
   },
-  "homepage": "https://github.com/unhappychoice/mdts#readme",
+  "homepage": "https://mdts.unhappychoice.com",
   "devDependencies": {
     "@types/commander": "^2.12.0",
     "@types/express": "^4.17.21",