@ditojs/server 2.38.0 → 2.40.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ditojs/server",
-  "version": "2.38.0",
+  "version": "2.40.0",
   "type": "module",
   "description": "Dito.js Server – Dito.js is a declarative and modern web framework, based on Objection.js, Koa.js and Vue.js",
   "repository": "https://github.com/ditojs/dito/tree/master/packages/server",
@@ -25,10 +25,10 @@
     "node >= 18"
   ],
   "dependencies": {
-    "@ditojs/admin": "^2.38.0",
-    "@ditojs/build": "^2.38.0",
-    "@ditojs/router": "^2.38.0",
-    "@ditojs/utils": "^2.38.0",
+    "@ditojs/admin": "^2.40.0",
+    "@ditojs/build": "^2.40.0",
+    "@ditojs/router": "^2.40.0",
+    "@ditojs/utils": "^2.40.0",
     "@koa/cors": "^5.0.0",
     "@koa/multer": "^3.0.2",
     "@originjs/vite-plugin-commonjs": "^1.0.3",
@@ -46,7 +46,7 @@
     "koa-compress": "^5.1.1",
     "koa-conditional-get": "^3.0.0",
     "koa-etag": "^4.0.0",
-    "koa-helmet": "^7.1.0",
+    "koa-helmet": "^8.0.1",
     "koa-mount": "^4.0.0",
     "koa-passport": "^6.0.0",
     "koa-response-time": "^2.1.0",
@@ -56,8 +56,8 @@
     "mime-types": "^2.1.35",
     "multer": "^1.4.5-lts.1",
     "multer-s3": "https://github.com/ditojs/multer-s3#dito",
-    "nanoid": "^5.0.8",
-    "parse-duration": "^1.1.0",
+    "nanoid": "^5.0.9",
+    "parse-duration": "^1.1.1",
     "passport-local": "^1.0.0",
     "passthrough-counter": "^1.0.0",
     "picocolors": "^1.1.1",
@@ -66,7 +66,7 @@
     "pino-pretty": "^13.0.0",
     "pluralize": "^8.0.0",
     "repl": "^0.1.3",
-    "type-fest": "^4.28.0",
+    "type-fest": "^4.30.0",
     "uuid": "^11.0.3"
   },
   "peerDependencies": {
@@ -76,19 +76,19 @@
     "objection": "^3.0.1"
   },
   "devDependencies": {
-    "@aws-sdk/client-s3": "^3.699.0",
-    "@aws-sdk/lib-storage": "^3.699.0",
+    "@aws-sdk/client-s3": "^3.701.0",
+    "@aws-sdk/lib-storage": "^3.701.0",
     "@types/koa-bodyparser": "^4.3.12",
     "@types/koa-compress": "^4.0.6",
     "@types/koa-response-time": "^2.1.5",
     "@types/koa-session": "^6.4.5",
     "@types/koa-static": "^4.0.4",
     "@types/koa__cors": "^5.0.0",
-    "@types/node": "^22.9.3",
+    "@types/node": "^22.10.1",
     "knex": "^3.1.0",
     "objection": "^3.1.5",
     "typescript": "^5.7.2"
   },
   "types": "types",
-  "gitHead": "5e64e0bf42e2a526e58c10710ddb2ae14288ffae"
+  "gitHead": "bc2ebaea27229f1fce8597bd62f00644fb0925d4"
 }

package/src/app/Application.js

@@ -164,6 +164,23 @@ export class Application extends Koa {
     this.router[method](path, route)
   }
 
+  fixModuleClassNames(modules) {
+    // Naming fix for a weird vite 6 bug where the model classes are sometimes
+    // prefixed with `_`, but only when imported in `vite.config.js`.
+    if (isPlainObject(modules)) {
+      for (const [key, module] of Object.entries(modules)) {
+        if (module?.name?.match(/^_(.*)$/)?.[1] === key) {
+          Object.defineProperty(module, 'name', {
+            value: key,
+            writable: false,
+            enumerable: false,
+            configurable: true
+          })
+        }
+      }
+    }
+  }
+
   getStorage(name) {
     return this.storages[name] || null
   }
@@ -190,8 +207,9 @@ export class Application extends Koa {
   }
 
   addStorages(storages) {
-    for (const [name, config] of Object.entries(storages)) {
-      this.addStorage(config, name)
+    this.fixModuleClassNames(storages)
+    for (const [key, config] of Object.entries(storages)) {
+      this.addStorage(config, key)
     }
   }
 
@@ -230,8 +248,9 @@ export class Application extends Koa {
   }
 
   addServices(services) {
-    for (const [name, service] of Object.entries(services)) {
-      this.addService(service, name)
+    this.fixModuleClassNames(services)
+    for (const [key, service] of Object.entries(services)) {
+      this.addService(service, key)
     }
   }
 
@@ -275,6 +294,7 @@ export class Application extends Koa {
   }
 
   addModels(models) {
+    this.fixModuleClassNames(models)
     models = Object.values(models)
     // First, add all models to the application, so that they can be referenced
     // by other models, e.g. in `jsonSchema` and  `relationMappings`:
@@ -365,6 +385,7 @@ export class Application extends Koa {
   }
 
   addControllers(controllers, namespace) {
+    this.fixModuleClassNames(controllers)
     for (const [key, value] of Object.entries(controllers)) {
       if (isModule(value) || isPlainObject(value)) {
         this.addControllers(value, namespace ? `${namespace}/${key}` : key)

package/src/controllers/AdminController.js

@@ -115,22 +115,10 @@ export class AdminController extends Controller {
   }
 
   async setupViteServer() {
-    const config = (
-      (await this.app.loadAdminViteConfig()) ||
-      this.defineViteConfig()
-    )
-
-    const development = this.mode === 'development'
-    const server = await createServer({
-      ...config,
+    const defaultConfig = {
       server: {
         middlewareMode: true,
-        hmr: {
-          // Use a random free port instead of vite's default 24678, since we
-          // may be running multiple servers in parallel (e.g. e2e and dev).
-          port: await getRandomFreePort()
-        },
-        ...(development && {
+        ...(this.mode === 'development' && {
           watch: {
             // Watch the @ditojs packages while in dev mode, although they are
             // inside the node_modules folder.
@@ -138,7 +126,22 @@ export class AdminController extends Controller {
           }
         })
       }
-    })
+    }
+
+    const viteConfig = (
+      (await this.app.loadAdminViteConfig()) ||
+      this.defineViteConfig()
+    )
+
+    const config = assignDeeply(defaultConfig, viteConfig)
+
+    if (config.server?.hmr?.port === 0) {
+      // Setting the port to 0 means use a random free port instead of vite's
+      // default 24678, since we may be running multiple servers in parallel.
+      config.server.hmr.port = await getRandomFreePort()
+    }
+
+    const server = await createServer(config)
 
     this.closed = false
 
@@ -159,7 +162,7 @@ export class AdminController extends Controller {
   }
 
   defineViteConfig(config = {}) {
-    const development = this.mode === 'development'
+    const isDevelopment = this.mode === 'development'
 
     const cwd = process.cwd()
     const root = this.getPath('root')
@@ -193,7 +196,7 @@ export class AdminController extends Controller {
               }
             }
           ],
-          build: development
+          build: isDevelopment
             ? {}
             : {
                 outDir: this.getPath('dist'),
@@ -226,7 +229,7 @@ export class AdminController extends Controller {
               },
           css: {
             postcss: getPostCssConfig(),
-            devSourcemap: development,
+            devSourcemap: isDevelopment,
             preprocessorOptions: {
               scss: {
                 // https://sass-lang.com/documentation/breaking-changes/legacy-js-api/
@@ -236,10 +239,10 @@ export class AdminController extends Controller {
             }
           },
           optimizeDeps: {
-            exclude: development ? ditoPackages : [],
+            exclude: isDevelopment ? ditoPackages : [],
             include: [
               ...(
-                development
+                isDevelopment
                   ? // https://discuss.prosemirror.net/t/rangeerror-adding-different-instances-of-a-keyed-plugin-plugin/4242/13
                     [
                       'prosemirror-state',