Merge 91e4852 into c28f070

CHANGELOG.md

@@ -1,27 +1,31 @@
 # Changelog
 
+# 3.0.0
+
+- Update `peerDependencies` to `awilix@4.0.0`
+
 # 2.1.1
 
-* Optimize use of `makeInvoker` in `controller`.
-* Use TypeScript 2.7's `esModuleInterop` flag.
+- Optimize use of `makeInvoker` in `controller`.
+- Use TypeScript 2.7's `esModuleInterop` flag.
 
 # 2.1.0
 
-* Add `inject` middleware factory.
+- Add `inject` middleware factory.
 
 # 2.0.0
 
-* Support Awilix v3.
+- Support Awilix v3.
 
 ## 1.0.0
 
-* Rewritten in TypeScript.
-* Added `awilix-router-core` binding for `koa-router`.
+- Rewritten in TypeScript.
+- Added `awilix-router-core` binding for `koa-router`.
 
 ## 0.1.1
 
-* Updated packages.
+- Updated packages.
 
 ## 0.1.0
 
-* Initial release.
+- Initial release.

package.json

@@ -38,41 +38,40 @@
   "homepage": "https://github.com/jeffijoe/awilix-koa#readme",
   "dependencies": {
     "awilix-router-core": "^1.3.2",
-    "koa-compose": "^4.0.0",
+    "koa-compose": "^4.1.0",
     "koa-router": "^7.4.0"
   },
   "devDependencies": {
-    "@semantic-release/condition-codeship": "^1.1.0",
-    "@semantic-release/release-notes-generator": "^6.0.6",
-    "@types/glob": "^5.0.35",
-    "@types/jest": "^22.2.0",
-    "@types/koa": "^2.0.44",
+    "@semantic-release/release-notes-generator": "^7.0.2",
+    "@types/glob": "^7.1.1",
+    "@types/jest": "^23.3.5",
+    "@types/koa": "^2.0.46",
     "@types/koa-compose": "^3.2.2",
-    "@types/koa-router": "^7.0.25",
-    "@types/node": "^9.4.6",
-    "@types/prettier": "^1.10.0",
+    "@types/koa-router": "^7.0.32",
+    "@types/node": "^10.11.7",
+    "@types/prettier": "^1.13.2",
     "@types/rimraf": "^2.0.2",
     "assert-request": "^1.0.6",
-    "awilix": "^3.0.6",
-    "babel-jest": "^22.4.1",
-    "babel-plugin-transform-decorators-legacy": "^1.3.4",
+    "awilix": "^4.0.0",
+    "babel-jest": "^23.6.0",
+    "babel-plugin-transform-decorators-legacy": "^1.3.5",
     "babel-preset-latest": "^6.24.1",
-    "coveralls": "^3.0.0",
-    "husky": "^0.14.3",
-    "jest": "^22.4.2",
-    "koa": "^2.5.0",
-    "lint-staged": "^7.0.0",
-    "prettier": "^1.11.1",
+    "coveralls": "^3.0.2",
+    "husky": "^1.1.2",
+    "jest": "^23.6.0",
+    "koa": "^2.5.3",
+    "lint-staged": "^7.3.0",
+    "prettier": "^1.14.3",
     "rimraf": "^2.6.1",
-    "semantic-release": "^15.0.1",
-    "ts-jest": "^22.4.1",
-    "tslint": "^5.9.1",
-    "tslint-config-prettier": "^1.9.0",
-    "tslint-config-standard": "^7.0.0",
-    "typescript": "^2.7.2"
+    "semantic-release": "^15.9.17",
+    "ts-jest": "^23.10.4",
+    "tslint": "^5.11.0",
+    "tslint-config-prettier": "^1.15.0",
+    "tslint-config-standard": "^8.0.1",
+    "typescript": "^3.1.3"
   },
   "peerDependencies": {
-    "awilix": "^3.0.0"
+    "awilix": "^4.0.0"
   },
   "lint-staged": {
     "*.ts": [
@@ -95,7 +94,7 @@
     ],
     "coverageDirectory": "<rootDir>/coverage",
     "transform": {
-      "\\.(ts|tsx)": "<rootDir>/node_modules/ts-jest/preprocessor.js",
+      "\\.(ts|tsx)": "ts-jest",
       "\\.(js|jsx)": "babel-jest"
     },
     "moduleFileExtensions": [

src/__tests__/controller.test.ts

@@ -4,6 +4,7 @@ import { loadControllers, controller } from '../controller'
 import { scopePerRequest } from '../scope-per-request'
 import { createContainer, asFunction } from 'awilix'
 import { route, GET, createController } from '../'
+import { AddressInfo } from 'net'
 
 const AssertRequest = require('assert-request')
 
@@ -76,7 +77,7 @@ function createServer(): Promise<[http.Server, any]> {
   )
   return new Promise(resolve => {
     const server = app.listen(() => {
-      const addr = server.address()
+      const addr = server.address() as AddressInfo
       resolve([server, AssertRequest(`http://127.0.0.1:${addr.port}`)])
     })
   })