textbrowser 0.52.1 → 0.53.1

package/CHANGES.md

@@ -1,5 +1,13 @@
 # CHANGES to `textbrowser`
 
+## 0.53.1
+
+- fix: broken escaping of regex and dirname issue
+
+## 0.53.0
+
+- fix: switch to serve-static to avoid headers problem
+
 ## 0.52.1
 
 - fix: proper use of node-static fork

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "textbrowser",
-  "version": "0.52.1",
+  "version": "0.53.1",
   "description": "Multilinear text browser",
   "type": "module",
   "main": "dist/index-es.min.js",
@@ -14,19 +14,6 @@
   "bin": {
     "textbrowser": "./server/main.js"
   },
-  "scripts": {
-    "tsc": "tsc",
-    "server": "./server/main.js --allowPlugins --namespace=test",
-    "start": "static -p 8081",
-    "rollup": "rollup -c",
-    "lint": "npm run eslint",
-    "eslint": "eslint .",
-    "mocha": "node_modules/.bin/_mocha --require test/bootstrap/node.js --require chai/register-assert.js test/textbrowserTests.js",
-    "node": "npm run eslint && npm run rollup && npm run mocha",
-    "open-test": "open-cli http://127.0.0.1:8081/test/",
-    "start-open-test": "run-p start open-test",
-    "test": "npm run eslint && npm run rollup && npm run start-open-test"
-  },
   "browserslist": [
     "defaults, not op_mini all"
   ],
@@ -39,7 +26,7 @@
     "url": "git+https://github.com/bahaidev/textbrowser.git"
   },
   "engines": {
-    "node": ">=14.19.1"
+    "node": ">=22.16.0"
   },
   "author": "Brett Zamir",
   "contributors": [],
@@ -49,7 +36,6 @@
   ],
   "dependencies": {
     "@babel/core": "^7.28.4",
-    "@node-static/node-static": "^0.8.0",
     "command-line-args": "^6.0.1",
     "dom-parser": "^1.1.5",
     "form-serialization": "^0.11.0",
@@ -61,6 +47,7 @@
     "json-refs": "^3.0.15",
     "load-stylesheets": "0.12.5",
     "node-fetch": "^3.3.2",
+    "serve-static": "^2.2.0",
     "simple-get-json": "^10.0.0"
   },
   "devDependencies": {
@@ -92,5 +79,18 @@
     "rollup-plugin-re": "^1.0.7",
     "textbrowser-data-schemas": "^0.2.0",
     "typescript": "^5.9.3"
+  },
+  "scripts": {
+    "tsc": "tsc",
+    "server": "./server/main.js --allowPlugins --namespace=test",
+    "start": "static -p 8081",
+    "rollup": "rollup -c",
+    "lint": "npm run eslint",
+    "eslint": "eslint .",
+    "mocha": "node_modules/.bin/_mocha --require test/bootstrap/node.js --require chai/register-assert.js test/textbrowserTests.js",
+    "node": "npm run eslint && npm run rollup && npm run mocha",
+    "open-test": "open-cli http://127.0.0.1:8081/test/",
+    "start-open-test": "run-p start open-test",
+    "test": "npm run eslint && npm run rollup && npm run start-open-test"
   }
-}
+}

package/server/main.js

@@ -3,7 +3,10 @@
 /* eslint-env node -- Environment here */
 import http from 'node:http';
 
-import * as statik from '@node-static/node-static';
+import statik from 'serve-static';
+import {fileURLToPath} from 'url';
+import {dirname} from 'path';
+
 import fetch from 'node-fetch';
 // @ts-expect-error Todo: Needs Types
 import commandLineArgs from 'command-line-args';
@@ -153,7 +156,6 @@ setGlobalVars(null, {
 
 if (userParams.nodeActivate) {
   // @ts-expect-error Ok
-  // eslint-disable-next-line n/no-unsupported-features/node-builtins -- node-fetch
   globalThis.fetch = /** @type {fetch} */ (fetch);
   setTimeout(async () => {
     await activateCallback({...userParamsWithDefaults, basePath});
@@ -165,8 +167,6 @@ console.log('past activate check');
 // @ts-expect-error Ok
 globalThis.DOMParser = DOMParser; // potentially used within resultsDisplay.js
 
-const fileServer = new statik.Server(); // Pass path; otherwise uses current directory
-
 /**
  * @typedef {{
  *   code: string,
@@ -199,6 +199,12 @@ let langData;
 /** @type {Languages} */
 let languagesInstance;
 
+// `import.meta.dirname` not working on server despite hosting high enough
+//   version of Node and being `type: "module"`
+const __filename = fileURLToPath(import.meta.url);
+const dir = dirname(__filename);
+const fileServer = statik(import.meta.dirname ?? dir);
+
 const srv = http.createServer(async (req, res) => {
   // console.log('URL::', new URL(req.url));
   const {pathname, search} = new URL(/** @type {string} */ (req.url), basePath);
@@ -207,7 +213,7 @@ const srv = http.createServer(async (req, res) => {
       if (pathname.includes('.git')) {
         req.url = '/index.html';
       }
-      fileServer.serve(req, res);
+      fileServer(req, res, next);
     };
 
     const next = function () {
@@ -240,7 +246,7 @@ const srv = http.createServer(async (req, res) => {
         ({regexp}) => {
           // Hack to ignore middleware like jsonParser (and hopefully
           //   not get any other)
-          return regexp.source !== String.raw`^\/?(?=\\/|$)` &&
+          return regexp.source !== String.raw`^\/?(?=\/|$)` &&
             regexp.test(/** @type {string} */ (req.url));
         }
       ))) {