chore: update dependencies

Author: thetutlage

benchmarks/adonisjs.ts

@@ -14,13 +14,20 @@ import { Application } from '@adonisjs/application'
 
 import { defineConfig } from '../index.js'
 import { Server } from '../src/server/main.js'
+import { Logger } from '@adonisjs/logger'
 
 const app = new Application(new URL('./', import.meta.url), { environment: 'web' })
 await app.init()
 
 const encryption = new Encryption({ secret: 'averylongrandom32charslongsecret' })
 
-const server = new Server(app, encryption, new Emitter(app), defineConfig({}))
+const server = new Server(
+  app,
+  encryption,
+  new Emitter(app),
+  new Logger({ enabled: false }),
+  defineConfig({})
+)
 server.getRouter().get('/', async (ctx) => {
   return ctx.response.send({ hello: 'world' })
 })

package.json

@@ -39,22 +39,22 @@
   "author": "virk,adonisjs",
   "license": "MIT",
   "devDependencies": {
-    "@adonisjs/application": "^6.6.0-0",
+    "@adonisjs/application": "^6.7.0-0",
     "@adonisjs/config": "^4.1.3-0",
     "@adonisjs/encryption": "^5.1.0-0",
-    "@adonisjs/events": "^8.4.0-0",
+    "@adonisjs/events": "^8.4.1-0",
     "@adonisjs/fold": "^9.9.0-0",
     "@adonisjs/logger": "^5.2.0-0",
-    "@commitlint/cli": "^17.4.1",
-    "@commitlint/config-conventional": "^17.4.0",
+    "@commitlint/cli": "^17.4.2",
+    "@commitlint/config-conventional": "^17.4.2",
     "@fastify/middie": "^8.1.0",
     "@japa/api-client": "^1.4.2",
     "@japa/assert": "^1.3.6",
     "@japa/expect-type": "^1.0.2",
     "@japa/run-failed-tests": "^1.1.0",
     "@japa/runner": "^2.2.2",
     "@japa/spec-reporter": "^1.3.2",
-    "@swc/core": "^1.3.26",
+    "@swc/core": "^1.3.27",
     "@types/accepts": "^1.3.5",
     "@types/content-disposition": "^0.5.5",
     "@types/cookie": "^0.5.1",
@@ -76,7 +76,7 @@
     "c8": "^7.12.0",
     "cross-env": "^7.0.3",
     "del-cli": "^5.0.0",
-    "eslint": "^8.31.0",
+    "eslint": "^8.32.0",
     "eslint-config-prettier": "^8.6.0",
     "eslint-plugin-adonis": "^3.0.3",
     "eslint-plugin-prettier": "^4.2.1",
@@ -87,7 +87,7 @@
     "husky": "^8.0.3",
     "np": "^7.6.3",
     "pem": "^1.14.6",
-    "prettier": "^2.8.1",
+    "prettier": "^2.8.3",
     "reflect-metadata": "^0.1.13",
     "supertest": "^6.3.3",
     "ts-node": "^10.9.1",
@@ -116,9 +116,9 @@
     "vary": "^1.1.2"
   },
   "peerDependencies": {
-    "@adonisjs/application": "^6.6.0-0",
+    "@adonisjs/application": "^6.7.0-0",
     "@adonisjs/encryption": "^5.1.0-0",
-    "@adonisjs/events": "^8.4.0-0",
+    "@adonisjs/events": "^8.4.1-0",
     "@adonisjs/fold": "^9.9.0-0"
   },
   "repository": {

src/router/brisk.ts

@@ -37,7 +37,7 @@ export class BriskRoute extends Macroable {
   /**
    * Reference to the AdonisJS application
    */
-  #app: Application<any, any>
+  #app: Application<any>
 
   /**
    * Middleware registered on the router
@@ -50,7 +50,7 @@ export class BriskRoute extends Macroable {
   route: null | Route = null
 
   constructor(
-    app: Application<any, any>,
+    app: Application<any>,
     routerMiddleware: ParsedGlobalMiddleware[],
     options: {
       pattern: string

src/router/main.ts

@@ -52,7 +52,7 @@ export class Router extends LookupStore {
   /**
    * Application is needed to resolve string based controller expressions
    */
-  #app: Application<any, any>
+  #app: Application<any>
 
   /**
    * Store with tokenized routes
@@ -92,7 +92,7 @@ export class Router extends LookupStore {
    */
   matchers = new Matchers()
 
-  constructor(app: Application<any, any>, encryption: Encryption, qsParser: Qs) {
+  constructor(app: Application<any>, encryption: Encryption, qsParser: Qs) {
     super(encryption, qsParser)
     this.#app = app
   }

src/router/resource.ts

@@ -45,7 +45,7 @@ export class RouteResource extends Macroable {
   /**
    * Reference to the AdonisJS application
    */
-  #app: Application<any, any>
+  #app: Application<any>
 
   /**
    * Middleware registered on the router
@@ -71,7 +71,7 @@ export class RouteResource extends Macroable {
   routes: Route[] = []
 
   constructor(
-    app: Application<any, any>,
+    app: Application<any>,
     routerMiddleware: ParsedGlobalMiddleware[],
     options: {
       resource: string

src/router/route.ts

@@ -75,7 +75,7 @@ export class Route<Controller extends Constructor<any> = any> extends Macroable
   /**
    * Reference to the AdonisJS application
    */
-  #app: Application<any, any>
+  #app: Application<any>
 
   /**
    * Middleware registered on the router
@@ -107,7 +107,7 @@ export class Route<Controller extends Constructor<any> = any> extends Macroable
   #middleware: StoreRouteMiddleware[][] = []
 
   constructor(
-    app: Application<any, any>,
+    app: Application<any>,
     routerMiddleware: ParsedGlobalMiddleware[],
     options: {
       pattern: string

src/server/main.ts

@@ -10,6 +10,7 @@
 import onFinished from 'on-finished'
 import { Emitter } from '@adonisjs/events'
 import Middleware from '@poppinss/middleware'
+import type { Logger } from '@adonisjs/logger'
 import type { Encryption } from '@adonisjs/encryption'
 import type { Server as HttpsServer } from 'node:https'
 import type { Application } from '@adonisjs/application'
@@ -45,6 +46,13 @@ export class Server {
     },
   }
 
+  /**
+   * Logger instance, a child logger is added
+   * to the context to have request specific
+   * logging capabilities.
+   */
+  #logger: Logger
+
   /**
    * Registered error handler (if any)
    */
@@ -64,7 +72,7 @@ export class Server {
   /**
    * The application instance to be shared with the router
    */
-  #app: Application<any, any>
+  #app: Application<any>
 
   /**
    * The encryption instance to be shared with the router
@@ -109,14 +117,16 @@ export class Server {
   }
 
   constructor(
-    app: Application<any, any>,
+    app: Application<any>,
     encryption: Encryption,
     emitter: Emitter<any>,
+    logger: Logger,
     config: ServerConfig
   ) {
     this.#app = app
     this.#emitter = emitter
     this.#config = config
+    this.#logger = logger
     this.#encryption = encryption
     this.#qsParser = new Qs(this.#config.qs)
     this.#router = new Router(this.#app, this.#encryption, this.#qsParser)
@@ -265,7 +275,7 @@ export class Server {
     const ctx = new HttpContext(
       request,
       response,
-      this.#app.logger.child({ request_id: request.id() }),
+      this.#logger.child({ request_id: request.id() }),
       resolver
     )
 

test_factories/router.ts

@@ -16,7 +16,7 @@ import { Router } from '../src/router/main.js'
 import { QsParserFactory } from './qs_parser_factory.js'
 
 type FactoryParameters = {
-  app: Application<any, any>
+  app: Application<any>
   encryption: Encryption
 }
 

test_factories/server_factory.ts

@@ -7,6 +7,7 @@
  * file that was distributed with this source code.
  */
 
+import { Logger } from '@adonisjs/logger'
 import { Emitter } from '@adonisjs/events'
 import type { Encryption } from '@adonisjs/encryption'
 import type { Application } from '@adonisjs/application'
@@ -18,7 +19,8 @@ import { defineConfig } from '../src/define_config.js'
 import type { ServerConfig } from '../src/types/server.js'
 
 type FactoryParameters = {
-  app: Application<any, any>
+  app: Application<any>
+  logger: Logger
   encryption: Encryption
   emitter: Emitter<any>
   config: Partial<ServerConfig>
@@ -38,6 +40,13 @@ export class ServerFactory {
     return this.#parameters.emitter || new Emitter(this.#getApp())
   }
 
+  /**
+   * Returns the logger instance
+   */
+  #getLogger() {
+    return this.#parameters.logger || new Logger({ enabled: false })
+  }
+
   /**
    * Returns the config for the server class
    */
@@ -76,6 +85,7 @@ export class ServerFactory {
       this.#getApp(),
       this.#createEncryption(),
       this.#getEmitter(),
+      this.#getLogger(),
       this.#getConfig()
     )
   }