wiki-server 0.26.0-rc.6 → 0.26.0-rc.8

package/lib/plugins.js

@@ -39,11 +39,8 @@ export default argv => {
   }
 
   const startServers = params => {
-    // emitter = new events.EventEmitter()
-    // forward.init params.app, emitter
-    // params.emitter = emitter
-
-    Object.keys(require.main.require('./package').dependencies)
+    const dependencies = params.packageJson.dependencies
+    Object.keys(dependencies)
       .filter(depend => depend.startsWith('wiki-plugin'))
       .forEach(plugin => {
         startServer(params, plugin)

package/lib/search.js

@@ -14,7 +14,7 @@ import events from 'node:events'
 import url from 'node:url'
 import writeFileAtomic from 'write-file-atomic'
 
-import MiniSearch from 'minisearch'
+import miniSearch from 'minisearch'
 
 export default argv => {
   const wikiName = new URL(argv.url).hostname

package/lib/server.js

@@ -58,10 +58,30 @@ import { warn } from 'node:console'
 import { createRequire } from 'module'
 const require = createRequire(import.meta.url)
 
-// Use dynamic import to load package.json from the main application's working directory
-const packageJsonPath = path.join(process.cwd(), 'package.json')
-const packageJsonUrl = url.pathToFileURL(packageJsonPath).href
-const { default: packageJson } = await import(packageJsonUrl, { with: { type: 'json' } })
+// Use import to load package.json from the main application's working directory
+//const { default: packageJson } = await import('wiki/package.json', { with: { type: 'json' } })
+const wikiPackageImport = async () => {
+  return new Promise(resolve => {
+    import('wiki/package.json', { with: { type: 'json' } })
+      .then(imported => {
+        resolve(imported.default)
+      })
+      .catch(e => {
+        return e
+      })
+      .then(async () => {
+        const packageJsonPath = path.join(process.cwd(), 'package.json')
+        const packageJsonUrl = url.pathToFileURL(packageJsonPath).href
+        import(packageJsonUrl, { with: { type: 'json' } })
+          .then(imported => {
+            resolve(imported.default)
+          })
+          .catch(e => console.error('problems importing package', e))
+      })
+  })
+}
+
+const packageJson = await wikiPackageImport()
 
 const render = page => {
   return (
@@ -147,6 +167,7 @@ export default async argv => {
   app.searchhandler = searchhandler = searchFactory(argv)
 
   // Dynamically import security adapter (also dynamic)
+  console.log('security_type', argv.security_type)
   const securityModule = await import(argv.security_type)
   app.securityhandler = securityhandler = securityModule.default(log, loga, argv)
 
@@ -401,14 +422,13 @@ export default async argv => {
 
     const getPackageFactory = plugin => {
       return new Promise(resolve => {
-        try {
-          import(`${plugin}/factory.json`, { with: { type: 'json' } }).then(({ default: factory }) => {
-            console.log(plugin, factory)
+        import(`${plugin}/factory.json`, { with: { type: 'json' } })
+          .then(({ default: factory }) => {
             resolve(factories.push(factory))
           })
-        } catch (error) {
-          resolve()
-        }
+          .catch(() => {
+            resolve()
+          })
       })
     }
 
@@ -703,10 +723,8 @@ export default async argv => {
     const getPackageVersion = packageName => {
       return new Promise(resolve => {
         try {
-          // Use dynamic import to load package.json from the main application's working directory
-          const packageJsonPath = path.join(process.cwd(), 'node_modules', packageName, 'package.json')
-          const packageJsonUrl = url.pathToFileURL(packageJsonPath).href
-          import(packageJsonUrl, { with: { type: 'json' } }).then(({ default: packageJson }) => {
+          // Use import to load package.json from the main application's working directory
+          import('wiki/package.json', { with: { type: 'json' } }).then(({ default: packageJson }) => {
             resolve({ [packageName]: packageJson.version })
           })
         } catch (error) {
@@ -966,7 +984,7 @@ export default async argv => {
     // ### Plugins ###
     // Should replace most WebSocketServers below.
     const plugins = pluginsFactory(argv)
-    plugins.startServers({ argv, app })
+    plugins.startServers({ argv, app, packageJson })
     // ### Sitemap ###
     // create sitemap at start-up
     sitemaphandler.createSitemap(pagehandler)

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "wiki-server",
   "description": "A Federated Wiki Server",
-  "version": "0.26.0-rc.6",
+  "version": "0.26.0-rc.8",
   "type": "module",
   "author": {
     "name": "Ward Cunningham",
@@ -32,20 +32,20 @@
   ],
   "main": "index.js",
   "dependencies": {
-    "body-parser": "^2.2.0",
+    "body-parser": "^2.2.1",
     "client-sessions": "^0.8.0",
     "coffeescript": "^2.5.0",
     "cookie-parser": "^1.4.4",
-    "dompurify": "^3.1.0",
+    "dompurify": "^3.3.0",
     "errorhandler": "^1.5.1",
     "express": "^5.1.0",
     "express-hbs": "^2.5.0",
     "flates": "0.0.5",
-    "jsdom": "^26.0.0",
+    "jsdom": "^27.2.0",
     "method-override": "^3.0.0",
-    "minisearch": "^7.1.0",
+    "minisearch": "^7.2.0",
     "morgan": "^1.10.1",
-    "write-file-atomic": "^6.0.0",
+    "write-file-atomic": "^7.0.0",
     "xml2js": "^0.6.2"
   },
   "scripts": {
@@ -56,13 +56,13 @@
     "update-authors": "node scripts/update-authors.js"
   },
   "devDependencies": {
-    "@eslint/js": "^9.32.0",
-    "eslint": "^9.32.0",
-    "globals": "^16.1.0",
+    "@eslint/js": "^9.39.1",
+    "eslint": "^9.39.1",
+    "globals": "^16.5.0",
     "grunt-git-authors": "^3.2.0",
-    "prettier": "^3.5.3",
+    "prettier": "^3.7.3",
     "supertest": "^7.1.4",
-    "wiki-client": "^0.31.3",
+    "wiki-client": "^0.31.6",
     "wiki-plugin-activity": "0.7",
     "wiki-plugin-video": "^0.4"
   },