fix: merge bug

package.json

@@ -10,7 +10,7 @@
     "autocannon": "^2.4.1",
     "chalk": "^3.0.0",
     "debug": "^4.1.1",
-    "eslint": "6",
+    "eslint": "^6.1.0",
     "gh-pages": "^2.2.0",
     "git-hooks": "^1.1.10",
     "lerna": "^3.14.1",

packages/eslint-midway-contrib/package.json

@@ -32,9 +32,8 @@
     "eslint-plugin-unicorn": "^16.0.0"
   },
   "devDependencies": {
-    "eslint": "6",
-    "tape": "4",
-    "typescript": "3"
+    "eslint": "^6.1.0",
+    "tape": "4"
   },
   "peerDependencies": {
     "eslint": ">=6.1.0"

packages/midway-core/src/context/requestContainer.ts

@@ -16,7 +16,7 @@ export class MidwayRequestContainer extends MidwayContainer {
     this.registerObject('logger', ctx.logger);
   }
 
-  get<T = any>(identifier: any, args?: any) :T {
+  get<T = any>(identifier: any, args?: any): T {
     if (typeof identifier !== 'string') {
       identifier = this.getIdentifier(identifier);
     }
@@ -34,7 +34,7 @@ export class MidwayRequestContainer extends MidwayContainer {
     }
   }
 
-  async getAsync<T = any>(identifier: any, args?: any) :Promise<T> {
+  async getAsync<T = any>(identifier: any, args?: any): Promise<T> {
     if (typeof identifier !== 'string') {
       identifier = this.getIdentifier(identifier);
     }

packages/midway-decorator/package.json

@@ -18,7 +18,7 @@
     "reflect-metadata": "^0.1.13"
   },
   "devDependencies": {
-    "midway-bin": "^1.17.0"
+    "midway-bin": "^2.0.0-beta.14"
   },
   "keywords": [
     "midway",

packages/midway-mock/app/extend/application.js

@@ -1,4 +1,4 @@
 "use strict";
 
-module.exports = require('../../dist/app/extend/application')
+module.exports = require('../../dist/app/extend/application');
 

packages/midway-mock/src/app/extend/application.ts

@@ -1,13 +1,12 @@
 import { MockApplication } from 'egg-mock';
-import { ApplicationContext } from 'injection';
-
+import { IApplicationContext } from '@midwayjs/core';
 
 interface Application extends MockApplication {
-  applicationContext: ApplicationContext
+  applicationContext: IApplicationContext;
   _mockFn(
     service: string,
     methodName: string,
-    fn: () => any): void
+    fn: () => any): void;
 }
 
 export function mockClassFunction(
@@ -22,12 +21,10 @@ export function mockClassFunction(
   const def = applicationContext.registry.getDefinition(className);
   if (! def) {
     throw new TypeError(`def undefined with className: "${className}", methodName: "${methodName}"`);
-  }
-  else {
+  } else {
     const clazz = def.path;
     if (clazz && typeof clazz === 'function') {
       this._mockFn(clazz.prototype, methodName, fn);
     }
   }
 }
-

packages/tslint-midway-contrib/package.json

@@ -1,5 +1,6 @@
 {
   "name": "tslint-midway-contrib",
+  "private": true,
   "version": "1.16.3",
   "description": "tslint default rule for midway",
   "main": "tslint.json",