@ditojs/server 1.19.1 → 1.20.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ditojs/server",
-  "version": "1.19.1",
+  "version": "1.20.1",
   "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": "^1.19.1",
-    "@ditojs/build": "^1.19.0",
-    "@ditojs/router": "^1.19.0",
-    "@ditojs/utils": "^1.19.0",
+    "@ditojs/admin": "^1.20.1",
+    "@ditojs/build": "^1.20.0",
+    "@ditojs/router": "^1.20.0",
+    "@ditojs/utils": "^1.20.0",
     "@koa/cors": "^4.0.0",
     "@koa/multer": "^3.0.2",
     "@originjs/vite-plugin-commonjs": "^1.0.3",
@@ -41,7 +41,7 @@
     "file-type": "^18.0.0",
     "image-size": "^1.0.2",
     "is-svg": "^4.3.2",
-    "koa": "^2.13.4",
+    "koa": "^2.14.0",
     "koa-bodyparser": "^4.3.0",
     "koa-compose": "^4.1.0",
     "koa-compress": "^5.1.0",
@@ -78,7 +78,7 @@
     "objection": "^3.0.1"
   },
   "devDependencies": {
-    "@aws-sdk/client-s3": "^3.223.0",
+    "@aws-sdk/client-s3": "^3.224.0",
     "@types/koa-bodyparser": "^4.3.10",
     "@types/koa-compress": "^4.0.3",
     "@types/koa-logger": "^3.1.2",
@@ -87,12 +87,12 @@
     "@types/koa-session": "^5.10.6",
     "@types/koa-static": "^4.0.2",
     "@types/koa__cors": "^3.3.0",
-    "@types/node": "^18.11.10",
+    "@types/node": "^18.11.11",
     "knex": "^2.3.0",
     "objection": "^3.0.1",
     "type-fest": "^3.3.0",
     "typescript": "^4.9.3"
   },
   "types": "types",
-  "gitHead": "a1ea63d36d6a971c3645f7f7245a277607cdbbb9"
+  "gitHead": "66013b5bf5ba7c216f950f39f311f56851de2821"
 }

package/src/controllers/AdminController.js

@@ -8,7 +8,8 @@ import {
 } from '@originjs/vite-plugin-commonjs'
 import {
   createRollupImportsResolver,
-  testModuleIdentifier
+  testModuleIdentifier,
+  getPostCssConfig
 } from '@ditojs/build'
 import { merge } from '@ditojs/utils'
 import { Controller } from './Controller.js'
@@ -126,6 +127,7 @@ export class AdminController extends Controller {
 
   async setupViteServer() {
     const config = this.getViteConfig()
+    const development = this.mode === 'development'
     const server = await createServer({
       ...config,
       server: {
@@ -135,12 +137,13 @@ export class AdminController extends Controller {
           // 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.
-          // TODO: This should only really be done if they are symlinked.
-          ignored: ['!**/node_modules/@ditojs/**']
-        }
+        ...(development && {
+          watch: {
+            // Watch the @ditojs packages while in dev mode, although they are
+            // inside the node_modules folder.
+            ignored: ['!**/node_modules/@ditojs/**']
+          }
+        })
       }
     })
 
@@ -192,31 +195,31 @@ export class AdminController extends Controller {
           }
         }],
       build: {
-        ...(development
-          ? {}
-          : {
-            outDir: this.getPath('dist'),
-            assetsDir: '.',
-            emptyOutDir: true,
-            chunkSizeWarningLimit: 1000,
-            rollupOptions: {
-              output: {
-                manualChunks(id) {
-                  if (id.startsWith(views)) {
-                    return 'views'
-                  } else if (id.startsWith(cwd)) {
-                    return 'common'
-                  } else {
-                    const module = id.match(/node_modules\/([^/$]*)/)?.[1] || ''
-                    return testModuleIdentifier(module, coreDependencies)
-                      ? 'core'
-                      : 'vendor'
-                  }
+        ...(!development && {
+          outDir: this.getPath('dist'),
+          assetsDir: '.',
+          emptyOutDir: true,
+          chunkSizeWarningLimit: 1000,
+          rollupOptions: {
+            output: {
+              manualChunks(id) {
+                if (id.startsWith(views)) {
+                  return 'views'
+                } else if (id.startsWith(cwd)) {
+                  return 'common'
+                } else {
+                  const module = id.match(/node_modules\/([^/$]*)/)?.[1] || ''
+                  return testModuleIdentifier(module, coreDependencies)
+                    ? 'core'
+                    : 'vendor'
                 }
               }
             }
           }
-        )
+        })
+      },
+      css: {
+        postcss: getPostCssConfig()
       },
       optimizeDeps: {
         exclude: development ? ditoPackages : [],

package/src/services/Service.js

@@ -1,13 +1,15 @@
-import { camelize } from '@ditojs/utils'
+import { camelize, hyphenate } from '@ditojs/utils'
 
 export class Service {
   initialized = false
+  #loggerName
 
   constructor(app, name) {
     this.app = app
     this.name = camelize(
       (name || this.constructor.name).match(/^(.*?)(?:Service|)$/)[1]
     )
+    this.#loggerName = hyphenate(this.name)
     this.config = null
   }
 
@@ -29,9 +31,11 @@ export class Service {
   async stop() {
   }
 
+  // Only use this method to get a logger instance that is bound to the context,
+  // otherwise use the getter.
   getLogger(ctx) {
     const logger = ctx?.logger ?? this.app.logger
-    return logger.child({ name: this.name })
+    return logger.child({ name: this.#loggerName })
   }
 
   get logger() {

package/src/utils/net.js

@@ -4,7 +4,7 @@ export async function getRandomFreePort() {
   return new Promise((resolve, reject) => {
     const srv = net.createServer()
     srv.listen(0, () => {
-      const port = srv.address().port
+      const { port } = srv.address()
       srv.close(err => {
         if (err) {
           reject(err)

package/types/index.d.ts

@@ -32,6 +32,7 @@ import {
   SetReturnType
 } from 'type-fest'
 import { UserConfig } from 'vite'
+import { Logger } from 'pino'
 
 export type Page<$Model extends Model = Model> = {
   total: number
@@ -402,6 +403,7 @@ export class Application<$Models extends Models = Models> {
   addControllers(controllers: ApplicationControllers, namespace?: string): void
   setupControllers(): Promise<void>
   getAdminViteConfig(config?: UserConfig): UserConfig
+  logger: Logger
 }
 export interface Application
   extends Omit<
@@ -1440,6 +1442,8 @@ export class Service {
   initialize(): void
   start(): Promise<void>
   stop(): Promise<void>
+  get logger(): Logger
+  getLogger(ctx: KoaContext): Logger
 }
 export type Services = Record<string, Class<Service> | Service>