Merge pull request #131 from midwayjs/fix_core

fix: import router to fix core
midwayjs · Jan 30, 2019 · f67d5c2 · f67d5c2
2 parents d4d9691 + 1a0b890
commit f67d5c2
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 21 deletions.
diff --git a/packages/midway-core/package.json b/packages/midway-core/package.json
@@ -29,7 +29,7 @@
   "dependencies": {
     "camelcase": "^5.0.0",
     "debug": "^4.1.1",
-    "egg-core": "4.13.1",
+    "egg-core": "^4.13.1",
     "extend2": "^1.0.0",
     "globby": "^9.0.0",
     "inflection": "^1.12.0",

diff --git a/packages/midway-web/package.json b/packages/midway-web/package.json
@@ -32,9 +32,10 @@
     "pedding": "^1.1.0"
   },
   "dependencies": {
+    "@eggjs/router": "^1.1.0",
     "debug": "^4.1.1",
     "egg": "^2.14.2",
-    "egg-core": "4.13.1",
+    "egg-core": "^4.13.1",
     "extend2": "^1.0.0",
     "globby": "^9.0.0",
     "inflection": "^1.12.0",

diff --git a/packages/midway-web/src/baseController.ts b/packages/midway-web/src/baseController.ts
@@ -1,4 +1,4 @@
-import { Router } from './router';
+import { EggRouter as Router } from '@eggjs/router';
 import {getMethodNames} from './utils';
 
 const debug = require('debug')('midway:controller');
@@ -51,4 +51,4 @@ export class BaseController {
       });
     }
   }
-}
+}
diff --git a/packages/midway-web/src/loader/webLoader.ts b/packages/midway-web/src/loader/webLoader.ts
@@ -1,10 +1,10 @@
+import { EggRouter as Router } from '@eggjs/router';
 import { TagClsMetadata, TAGGED_CLS } from 'injection';
 import { MidwayLoader } from 'midway-core';
 import * as path from 'path';
 import 'reflect-metadata';
 import { WEB_ROUTER_CLS, WEB_ROUTER_PREFIX_CLS, WEB_ROUTER_PRIORITY, WEB_ROUTER_PROP } from '../decorators/metaKeys';
 import { loading } from '../loading';
-import { Router } from '../router';
 
 const is = require('is-type-of');
 

diff --git a/packages/midway-web/src/router.ts b/packages/midway-web/src/router.ts
diff --git a/packages/midway/package.json b/packages/midway/package.json
@@ -24,7 +24,7 @@
   "dependencies": {
     "egg": "^2.14.2",
     "egg-cluster": "^1.22.2",
-    "egg-core": "4.13.1",
+    "egg-core": "^4.13.1",
     "injection": "^1.1.0",
     "midway-core": "^1.2.1",
     "midway-web": "^1.2.1",