wiki-server 0.26.0 → 0.26.2

package/lib/page.js

@@ -76,19 +76,22 @@ export default argv => {
   // create a list of plugin pages.
   const pluginPages = new Map()
 
-  Object.keys(packageJson.dependencies)
-    .filter(depend => depend.startsWith('wiki-plugin'))
-    .forEach(plugin => {
-      const pagesPath = path.join(path.dirname(require.resolve(`${plugin}/package`)), 'pages')
-      fs.readdir(pagesPath, { withFileTypes: true }, (err, entries) => {
-        if (err) return
-        entries.forEach(entry => {
-          if (entry.isFile() && !pluginPages.has(entry.name)) {
-            pluginPages.set(entry.name, { pluginName: plugin, pluginPath: entry.parentPath })
-          }
-        })
+  const dependencyPlugins = Object.keys(packageJson.dependencies).filter(depend => depend.startsWith('wiki-plugin'))
+  const plugins = dependencyPlugins.length
+    ? dependencyPlugins
+    : Object.keys(packageJson.devDependencies).filter(depend => depend.startsWith('wiki-plugin'))
+
+  plugins.forEach(plugin => {
+    const pagesPath = path.join(path.dirname(require.resolve(`${plugin}/package`)), 'pages')
+    fs.readdir(pagesPath, { withFileTypes: true }, (err, entries) => {
+      if (err) return
+      entries.forEach(entry => {
+        if (entry.isFile() && !pluginPages.has(entry.name)) {
+          pluginPages.set(entry.name, { pluginName: plugin, pluginPath: entry.parentPath })
+        }
       })
     })
+  })
 
   // #### Private utility methods. ####
   const load_parse = (loc, cb, annotations = {}) => {

package/lib/server.js

@@ -256,10 +256,22 @@ export default async argv => {
 
   // use logger, at least in development, probably needs a param to configure (or turn off).
   // use stream to direct to somewhere other than stdout.
-  logger.token('vhost', (req, res) => {
-    return colorString(wikiName)
-  })
-  app.use(logger(':vhost :method :url :status :res[content-length] - :response-time ms'))
+  const vhost = colorString(wikiName)
+  app.use(
+    logger((tokens, req, res) => {
+      return [
+        vhost,
+        tokens.method(req, res),
+        tokens.url(req, res),
+        tokens.status(req, res),
+        tokens.res(req, res, 'content-length'),
+        '-',
+        tokens['response-time'](req, res),
+        'ms',
+      ].join(' ')
+    }),
+  )
+
   app.use(cookieParser())
   app.use(bodyParser.json({ limit: argv.uploadLimit }))
   app.use(bodyParser.urlencoded({ extended: true, limit: argv.uploadLimit }))
@@ -437,12 +449,17 @@ export default async argv => {
       })
     }
 
+    // in test (wiki-server) the plugins are listed as devDependencues, so we need to fallback to
+    // using devDEpendencies when there are no plugins in dependencies.
+    const dependencyPlugins = Object.keys(packageJson.dependencies).filter(depend => depend.startsWith('wiki-plugin'))
+    const plugins = dependencyPlugins.length
+      ? dependencyPlugins
+      : Object.keys(packageJson.devDependencies).filter(depend => depend.startsWith('wiki-plugin'))
+
     Promise.all(
-      Object.keys(packageJson.dependencies)
-        .filter(depend => depend.startsWith('wiki-plugin'))
-        .map(plugin => {
-          return getPackageFactory(plugin)
-        }),
+      plugins.map(plugin => {
+        return getPackageFactory(plugin)
+      }),
     ).then(() => res.end(JSON.stringify(factories)))
   })
 
@@ -623,14 +640,21 @@ export default async argv => {
 
   // Returns a list of installed plugins. (does this get called anymore!)
   app.get('/system/plugins.json', cors, (req, res) => {
+    // create a list of plugin pages.
     try {
-      const pluginNames = Object.keys(require.main.require('./package').dependencies)
-        .filter(depend => depend.startsWith('wiki-plugin'))
-        .map(name => name.slice(12))
+      const dependencyPlugins = Object.keys(packageJson.dependencies).filter(depend => depend.startsWith('wiki-plugin'))
+      const plugins = dependencyPlugins.length
+        ? dependencyPlugins
+        : Object.keys(packageJson.devDependencies).filter(depend => depend.startsWith('wiki-plugin'))
+      const pluginNames = plugins.map(name => name.slice(12))
       res.send(pluginNames)
     } catch (e) {
       return res.e(e)
     }
+    // Object.keys(packageJson.dependencies)
+    //   .filter(depend => depend.startsWith('wiki-plugin'))
+    //   .map(name => name.slice(12))
+    //   .then(names => res.send(names))
   })
   //{
   const sitemapLoc = path.join(argv.status, 'sitemap.json')

package/lib/sitemap.js

@@ -233,7 +233,7 @@ export default argv => {
     itself.emit('finished')
   }
   itself.isWorking = () => {
-    working
+    return working
   }
 
   itself.createSitemap = pagehandler => {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "wiki-server",
   "description": "A Federated Wiki Server",
-  "version": "0.26.0",
+  "version": "0.26.2",
   "type": "module",
   "author": {
     "name": "Ward Cunningham",
@@ -34,14 +34,13 @@
   "dependencies": {
     "body-parser": "^2.2.1",
     "client-sessions": "^0.8.0",
-    "coffeescript": "^2.5.0",
     "cookie-parser": "^1.4.4",
     "dompurify": "^3.3.0",
     "errorhandler": "^1.5.1",
     "express": "^5.1.0",
     "express-hbs": "^2.5.0",
     "flates": "0.0.5",
-    "jsdom": "^27.2.0",
+    "jsdom": "^28.1.0",
     "method-override": "^3.0.0",
     "minisearch": "^7.2.0",
     "morgan": "^1.10.1",
@@ -51,14 +50,14 @@
   "scripts": {
     "prettier:format": "prettier --write './**/*.js'",
     "prettier:check": "prettier --check ./**/*.js",
-    "test": "cd test; node --test",
-    "watch": "cd test; node --test --watch",
+    "test": "node --test",
+    "watch": "node --test --watch",
     "update-authors": "node scripts/update-authors.js"
   },
   "devDependencies": {
-    "@eslint/js": "^9.39.1",
-    "eslint": "^9.39.1",
-    "globals": "^16.5.0",
+    "@eslint/js": "^10.0.1",
+    "eslint": "^10.0.0",
+    "globals": "^17.3.0",
     "grunt-git-authors": "^3.2.0",
     "prettier": "^3.7.3",
     "supertest": "^7.1.4",