feat: support define custom egg framework (#709)

midwayjs · Nov 10, 2020 · f5baba1 · f5baba1
1 parent 0088cb2
commit f5baba1
Show file tree

Hide file tree

Showing 33 changed files with 370 additions and 236 deletions.
diff --git a/lerna.json b/lerna.json
@@ -9,6 +9,9 @@
       "noCi": true,
       "npmClientArgs": [
         "--no-package-lock"
+      ],
+      "nohoist": [
+        "egg"
       ]
     },
     "publish": {

diff --git a/packages-serverless/egg-layer/package.json b/packages-serverless/egg-layer/package.json
@@ -3,12 +3,11 @@
   "version": "1.2.10",
   "main": "index.js",
   "scripts": {
-    "test": "midway-bin test",
-    "debug": "midway-bin test",
-    "cov": "midway-bin cov"
+    "test": "midway-bin test --forceExit",
+    "cov": "midway-bin cov --forceExit"
   },
   "dependencies": {
-    "egg": "^2.25.0",
+    "egg": "^2.28.0",
     "request": "^2.88.2"
   },
   "devDependencies": {

diff --git a/packages-serverless/express-layer/package.json b/packages-serverless/express-layer/package.json
@@ -3,9 +3,8 @@
   "version": "1.2.13",
   "main": "index.js",
   "scripts": {
-    "test": "midway-bin test",
-    "debug": "midway-bin test",
-    "cov": "midway-bin cov"
+    "test": "midway-bin test --forceExit",
+    "cov": "midway-bin cov --forceExit"
   },
   "dependencies": {
     "request": "^2.88.2"

diff --git a/packages-serverless/koa-layer/package.json b/packages-serverless/koa-layer/package.json
@@ -3,9 +3,8 @@
   "version": "1.2.9",
   "main": "index.js",
   "scripts": {
-    "test": "midway-bin test",
-    "debug": "midway-bin test",
-    "cov": "midway-bin cov"
+    "test": "midway-bin test --forceExit",
+    "cov": "midway-bin cov --forceExit"
   },
   "dependencies": {
     "request": "^2.88.2"
@@ -18,9 +17,9 @@
     "@midwayjs/serverless-fc-trigger": "^1.2.9",
     "@midwayjs/serverless-scf-starter": "^1.2.9",
     "@midwayjs/serverless-scf-trigger": "^1.2.9",
-    "koa": "^2.11.0",
+    "koa": "^2.13.0",
     "koa-bodyparser": "^4.2.1",
-    "koa-router": "^9.1.0",
+    "koa-router": "^9.4.0",
     "supertest": "^4.0.2"
   },
   "engines": {

diff --git a/packages-serverless/runtime-engine/package.json b/packages-serverless/runtime-engine/package.json
@@ -4,16 +4,16 @@
   "main": "dist/index",
   "typings": "dist/index.d.ts",
   "dependencies": {
-    "egg-logger": "^2.3.1",
+    "egg-logger": "^2.4.2",
     "mz": "^2.7.0"
   },
   "devDependencies": {
     "@midwayjs/cli": "^1.0.0"
   },
   "scripts": {
     "build": "midway-bin build -c",
-    "test": "midway-bin test --ts",
-    "cov": "midway-bin cov --ts"
+    "test": "midway-bin test --ts --forceExit",
+    "cov": "midway-bin cov --ts --forceExit"
   },
   "engines": {
     "node": ">= 10"

diff --git a/packages-serverless/runtime-mock/package.json b/packages-serverless/runtime-mock/package.json
@@ -18,8 +18,8 @@
   ],
   "scripts": {
     "build": "midway-bin build -c",
-    "test": "midway-bin test --ts",
-    "cov": "midway-bin cov --ts"
+    "test": "midway-bin test --ts --forceExit",
+    "cov": "midway-bin cov --ts --forceExit"
   },
   "repository": {
     "type": "git",

diff --git a/packages-serverless/serverless-aws-starter/package.json b/packages-serverless/serverless-aws-starter/package.json
@@ -20,8 +20,8 @@
   ],
   "scripts": {
     "build": "midway-bin build -c",
-    "test": "midway-bin test --ts",
-    "cov": "midway-bin cov --ts"
+    "test": "midway-bin test --ts --forceExit",
+    "cov": "midway-bin cov --ts --forceExit"
   },
   "repository": {
     "type": "git",

diff --git a/packages-serverless/serverless-fc-starter/package.json b/packages-serverless/serverless-fc-starter/package.json
@@ -21,8 +21,8 @@
   ],
   "scripts": {
     "build": "midway-bin build -c",
-    "test": "midway-bin test --ts",
-    "cov": "midway-bin cov --ts"
+    "test": "midway-bin test --ts --forceExit",
+    "cov": "midway-bin cov --ts --forceExit"
   },
   "repository": {
     "type": "git",

diff --git a/packages-serverless/serverless-fc-trigger/package.json b/packages-serverless/serverless-fc-trigger/package.json
@@ -22,8 +22,8 @@
   ],
   "scripts": {
     "build": "midway-bin build -c",
-    "test": "midway-bin test --ts",
-    "cov": "midway-bin cov --ts"
+    "test": "midway-bin test --ts --forceExit",
+    "cov": "midway-bin cov --ts --forceExit"
   },
   "repository": {
     "type": "git",

diff --git a/packages-serverless/serverless-http-parser/package.json b/packages-serverless/serverless-http-parser/package.json
@@ -30,8 +30,8 @@
   ],
   "scripts": {
     "build": "midway-bin build -c",
-    "test": "midway-bin test --ts",
-    "cov": "midway-bin cov --ts"
+    "test": "midway-bin test --ts --forceExit",
+    "cov": "midway-bin cov --ts --forceExit"
   },
   "repository": {
     "type": "git",

diff --git a/packages-serverless/serverless-scf-starter/package.json b/packages-serverless/serverless-scf-starter/package.json
@@ -20,8 +20,8 @@
   ],
   "scripts": {
     "build": "midway-bin build -c",
-    "test": "midway-bin test --ts",
-    "cov": "midway-bin cov --ts"
+    "test": "midway-bin test --ts --forceExit",
+    "cov": "midway-bin cov --ts --forceExit"
   },
   "repository": {
     "type": "git",

diff --git a/packages-serverless/serverless-scf-trigger/package.json b/packages-serverless/serverless-scf-trigger/package.json
@@ -23,8 +23,8 @@
   ],
   "scripts": {
     "build": "midway-bin build -c",
-    "test": "midway-bin test --ts",
-    "cov": "midway-bin cov --ts"
+    "test": "midway-bin test --ts --forceExit",
+    "cov": "midway-bin cov --ts --forceExit"
   },
   "repository": {
     "type": "git",

diff --git a/packages/bootstrap/package.json b/packages/bootstrap/package.json
@@ -6,8 +6,8 @@
   "typings": "dist/index.d.ts",
   "scripts": {
     "build": "midway-bin build -c",
-    "test": "midway-bin test",
-    "cov": "midway-bin test --cov",
+    "test": "midway-bin test --ts --forceExit",
+    "cov": "midway-bin cov --ts --forceExit",
     "link": "npm link"
   },
   "keywords": [

diff --git a/packages/core/package.json b/packages/core/package.json
@@ -6,8 +6,8 @@
   "typings": "dist/index.d.ts",
   "scripts": {
     "build": "midway-bin build -c",
-    "test": "midway-bin test",
-    "cov": "midway-bin cov",
+    "test": "midway-bin test --ts --forceExit",
+    "cov": "midway-bin cov --ts --forceExit",
     "link": "npm link"
   },
   "keywords": [
@@ -23,7 +23,7 @@
   "devDependencies": {
     "@midwayjs/cli": "^1.0.0",
     "chai": "^4.2.0",
-    "mm": "^2.5.0",
+    "mm": "3",
     "sinon": "^7.2.2"
   },
   "dependencies": {

diff --git a/packages/core/src/util/index.ts b/packages/core/src/util/index.ts
@@ -1,4 +1,5 @@
 import { dirname, resolve, sep, extname } from 'path';
+import { readFileSync } from 'fs';
 
 /**
  * get all method names from obj or it's prototype
@@ -33,12 +34,19 @@ export function getPrototypeNames(obj) {
   return result.filter(k => ownKeysOnObjectPrototype.indexOf(k) === -1);
 }
 
-export const safeRequire = p => {
+export const safeRequire = (p, enabledCache = true) => {
   if (p.startsWith(`.${sep}`) || p.startsWith(`..${sep}`)) {
     p = resolve(dirname(module.parent.filename), p);
   }
   try {
-    return require(p);
+    if (enabledCache) {
+      return require(p);
+    } else {
+      const content = readFileSync(p, {
+        encoding: 'utf-8',
+      });
+      return JSON.parse(content);
+    }
   } catch (err) {
     return undefined;
   }

diff --git a/packages/decorator/package.json b/packages/decorator/package.json
@@ -6,8 +6,8 @@
   "typings": "dist/index.d.ts",
   "scripts": {
     "build": "midway-bin build -c",
-    "test": "midway-bin test",
-    "cov": "midway-bin test --cov",
+    "test": "midway-bin test --ts --forceExit",
+    "cov": "midway-bin cov --ts --forceExit",
     "ci": "npm run test",
     "link": "npm link"
   },
@@ -21,7 +21,7 @@
   },
   "devDependencies": {
     "@midwayjs/cli": "^1.0.0",
-    "mm": "^2.5.0"
+    "mm": "3"
   },
   "keywords": [
     "midway",

diff --git a/packages/faas/package.json b/packages/faas/package.json
@@ -15,7 +15,7 @@
     "@midwayjs/mock": "^2.3.23",
     "@midwayjs/serverless-fc-starter": "^1.0.0",
     "@midwayjs/serverless-scf-starter": "^1.0.0",
-    "mm": "^2.5.0"
+    "mm": "3"
   },
   "engines": {
     "node": ">= 10"
@@ -37,8 +37,8 @@
   ],
   "scripts": {
     "build": "midway-bin build -c",
-    "test": "midway-bin test",
-    "cov": "midway-bin test --cov"
+    "test": "midway-bin test --ts --forceExit",
+    "cov": "midway-bin cov --ts --forceExit"
   },
   "repository": {
     "type": "git",

diff --git a/packages/midway/package.json b/packages/midway/package.json
@@ -6,9 +6,8 @@
   "typings": "dist/index.d.ts",
   "scripts": {
     "build": "midway-bin build -c",
-    "test": "midway-bin test",
-    "cov": "midway-bin test --cov",
-    "ci": "npm run test",
+    "test": "midway-bin test --ts --forceExit",
+    "cov": "midway-bin cov --ts --forceExit",
     "link": "npm link"
   },
   "keywords": [

diff --git a/packages/mock/package.json b/packages/mock/package.json
@@ -6,8 +6,8 @@
   "typings": "dist/index.d.ts",
   "scripts": {
     "build": "midway-bin build -c",
-    "test": "midway-bin test --forceExit",
-    "cov": "midway-bin test --cov --forceExit",
+    "test": "midway-bin test --ts --forceExit",
+    "cov": "midway-bin cov --ts --forceExit",
     "ci": "midway-bin test",
     "link": "npm link"
   },

diff --git a/packages/rabbitmq/package.json b/packages/rabbitmq/package.json
@@ -6,8 +6,8 @@
   "typings": "dist/index.d.ts",
   "scripts": {
     "build": "midway-bin build -c",
-    "test": "midway-bin test",
-    "cov": "midway-bin cov",
+    "test": "midway-bin test --ts --forceExit",
+    "cov": "midway-bin cov --ts --forceExit",
     "ci": "npm run test"
   },
   "keywords": [

diff --git a/packages/socketio/package.json b/packages/socketio/package.json
@@ -6,8 +6,8 @@
   "typings": "dist/index.d.ts",
   "scripts": {
     "build": "midway-bin build -c",
-    "test": "midway-bin test --forceExit",
-    "cov": "midway-bin cov --forceExit",
+    "test": "midway-bin test --ts --forceExit",
+    "cov": "midway-bin cov --ts --forceExit",
     "ci": "npm run test"
   },
   "keywords": [

diff --git a/packages/web-koa/package.json b/packages/web-koa/package.json
@@ -6,8 +6,8 @@
   "typings": "dist/index.d.ts",
   "scripts": {
     "build": "midway-bin build -c",
-    "test": "midway-bin test --forceExit",
-    "cov": "midway-bin cov --forceExit",
+    "test": "midway-bin test --ts --forceExit",
+    "cov": "midway-bin cov --ts --forceExit",
     "ci": "npm run test"
   },
   "keywords": [

diff --git a/packages/web/package.json b/packages/web/package.json
@@ -6,8 +6,8 @@
   "typings": "dist/index.d.ts",
   "scripts": {
     "build": "midway-bin build -c",
-    "test": "midway-bin test --ts",
-    "cov": "midway-bin cov --ts",
+    "test": "midway-bin test --ts --forceExit",
+    "cov": "midway-bin cov --ts --forceExit",
     "link": "npm link"
   },
   "keywords": [
@@ -30,6 +30,7 @@
     "@midwayjs/cli": "^1.0.0",
     "@midwayjs/mock": "^2.3.23",
     "egg-view-nunjucks": "^2.2.0",
+    "fake-egg": "1.0.0",
     "fs-extra": "^8.0.1",
     "pedding": "^1.1.0",
     "react": "^16.13.1",