wiki-server 0.26.0-rc.7 → 0.26.0-rc.9

package/lib/page.js

@@ -22,16 +22,38 @@
 
 import fs from 'node:fs'
 import path from 'node:path'
-import { pathToFileURL } from 'node:url'
+import url from 'node:url'
 import events from 'node:events'
 
 import { createRequire } from 'node: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 = pathToFileURL(packageJsonPath).href
-const { default: packageJson } = await import(packageJsonUrl, { with: { type: 'json' } })
+const wikiPackageImport = async () => {
+  let done = false
+  return new Promise(resolve => {
+    import('wiki/package.json', { with: { type: 'json' } })
+      .then(imported => {
+        done = true
+        resolve(imported.default)
+      })
+      .catch(e => {
+        return e
+      })
+      .then(async () => {
+        if (done) return
+        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()
 
 // import random_id from './random_id.cjs'; // Uncomment if needed
 import synopsis from 'wiki-client/lib/synopsis.js' // Add correct extension if necessary

package/lib/server.js

@@ -58,10 +58,33 @@ 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 () => {
+  let done = false
+  return new Promise(resolve => {
+    import('wiki/package.json', { with: { type: 'json' } })
+      .then(imported => {
+        done = true
+        resolve(imported.default)
+      })
+      .catch(e => {
+        return e
+      })
+      .then(async () => {
+        if (done) return
+        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 (
@@ -703,10 +726,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(`${packageName}/package.json`, { with: { type: 'json' } }).then(({ default: packageJson }) => {
             resolve({ [packageName]: packageJson.version })
           })
         } catch (error) {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "wiki-server",
   "description": "A Federated Wiki Server",
-  "version": "0.26.0-rc.7",
+  "version": "0.26.0-rc.9",
   "type": "module",
   "author": {
     "name": "Ward Cunningham",
@@ -32,7 +32,7 @@
   ],
   "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",
@@ -60,7 +60,7 @@
     "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.6",
     "wiki-plugin-activity": "0.7",