@ditojs/server 1.8.1 → 1.9.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ditojs/server",
-  "version": "1.8.1",
+  "version": "1.9.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",
@@ -21,22 +21,22 @@
     "node >= 16"
   ],
   "dependencies": {
-    "@ditojs/admin": "^1.8.0",
+    "@ditojs/admin": "^1.9.0",
     "@ditojs/build": "^1.8.0",
-    "@ditojs/router": "^1.8.0",
-    "@ditojs/utils": "^1.8.0",
+    "@ditojs/router": "^1.9.0",
+    "@ditojs/utils": "^1.9.0",
     "@koa/cors": "^3.3.0",
     "@koa/multer": "^3.0.0",
     "@originjs/vite-plugin-commonjs": "^1.0.3",
     "ajv": "^8.11.0",
     "ajv-formats": "^2.1.1",
-    "aws-sdk": "^2.1141.0",
+    "aws-sdk": "^2.1171.0",
     "axios": "^0.27.2",
     "bcryptjs": "^2.4.3",
     "bytes": "^3.1.2",
     "data-uri-to-buffer": "^4.0.0",
-    "eventemitter2": "^6.4.5",
-    "file-type": "^17.1.1",
+    "eventemitter2": "^6.4.6",
+    "file-type": "^17.1.2",
     "fs-extra": "^10.1.0",
     "image-size": "^1.0.1",
     "is-svg": "^4.3.2",
@@ -53,31 +53,31 @@
     "koa-session": "^6.2.0",
     "koa-static": "^5.0.0",
     "mime-types": "^2.1.35",
-    "multer": "^1.4.4",
+    "multer": "^1.4.5-lts.1",
     "multer-s3": "^2.10.0",
-    "nanoid": "^3.3.4",
+    "nanoid": "^4.0.0",
     "parse-duration": "^1.0.2",
     "passport-local": "^1.0.0",
     "passthrough-counter": "^1.0.0",
     "picocolors": "^1.0.0",
     "picomatch": "^2.3.1",
-    "pino": "^7.11.0",
-    "pino-pretty": "^7.6.1",
+    "pino": "^8.1.0",
+    "pino-pretty": "^8.1.0",
     "pluralize": "^8.0.0",
     "repl": "^0.1.3",
     "uuid": "^8.3.2",
-    "vite": "^2.9.9",
+    "vite": "^2.9.14",
     "vite-plugin-vue2": "^2.0.1",
-    "vue": "^2.6.14",
-    "vue-template-compiler": "^2.6.14"
+    "vue": "^2.7.4",
+    "vue-template-compiler": "^2.7.4"
   },
   "peerDependencies": {
     "knex": "^1.0.5",
     "objection": "^3.0.1"
   },
   "devDependencies": {
-    "knex": "^2.0.0",
+    "knex": "^2.1.0",
     "objection": "^3.0.1"
   },
-  "gitHead": "390e0a7e0782b3cb5cff5e5d0454a35c7a954df5"
+  "gitHead": "034973580c50fc7d8bb4ad07ec4c91782eb329a5"
 }

package/src/controllers/AdminController.js

@@ -15,7 +15,7 @@ import { merge } from '@ditojs/utils'
 import { Controller } from './Controller.js'
 import { handleConnectMiddleware } from '../middleware/index.js'
 import { ControllerError } from '../errors/index.js'
-import { formatJson, deprecate } from '../utils/index.js'
+import { formatJson, getRandomFreePort, deprecate } from '../utils/index.js'
 
 export class AdminController extends Controller {
   // @override
@@ -131,6 +131,11 @@ export class AdminController extends Controller {
       ...config,
       server: {
         middlewareMode: 'html',
+        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()
+        },
         watch: {
           // Watch the @ditojs packages while in dev mode, although they are
           // inside the node_modules folder.

package/src/utils/index.js

@@ -4,5 +4,6 @@ export * from './emitter.js'
 export * from './function.js'
 export * from './handler.js'
 export * from './json.js'
+export * from './net.js'
 export * from './object.js'
 export * from './scope.js'

package/src/utils/net.js

@@ -0,0 +1,17 @@
+import net from 'net'
+
+export async function getRandomFreePort() {
+  return new Promise((resolve, reject) => {
+    const srv = net.createServer()
+    srv.listen(0, () => {
+      const port = srv.address().port
+      srv.close(err => {
+        if (err) {
+          reject(err)
+        } else {
+          resolve(port)
+        }
+      })
+    })
+  })
+}