diff --git a/cnode-api/package.json b/cnode-api/package.json index 31a65dd..94ffe47 100644 --- a/cnode-api/package.json +++ b/cnode-api/package.json @@ -4,12 +4,12 @@ "description": "", "private": true, "dependencies": { - "egg": "^1.10.1", + "egg": "^2.2.0", "egg-validate": "^1.0.0" }, "devDependencies": { - "egg-bin": "^4.3.5", - "egg-mock": "^3.13.1" + "egg-bin": "^4.3.7", + "egg-mock": "^3.14.0" }, "engines": { "node": ">=8.9.0" diff --git a/cookie-session/package.json b/cookie-session/package.json index e3c70dd..715d139 100644 --- a/cookie-session/package.json +++ b/cookie-session/package.json @@ -1,11 +1,11 @@ { "name": "cookie-session-example", "dependencies": { - "egg": "^1.10.1" + "egg": "^2.2.0" }, "devDependencies": { - "egg-bin": "^4.3.5", - "egg-mock": "^3.13.1" + "egg-bin": "^4.3.7", + "egg-mock": "^3.14.0" }, "scripts": { "dev": "egg-bin dev", diff --git a/cookie/package.json b/cookie/package.json index a2088b2..3aa2fb0 100644 --- a/cookie/package.json +++ b/cookie/package.json @@ -1,11 +1,11 @@ { "name": "cookie-example", "dependencies": { - "egg": "^1.10.1" + "egg": "^2.2.0" }, "devDependencies": { - "egg-bin": "^4.3.5", - "egg-mock": "^3.13.1" + "egg-bin": "^4.3.7", + "egg-mock": "^3.14.0" }, "scripts": { "dev": "egg-bin dev", diff --git a/custom-env/README.md b/custom-env/README.md index 0795671..ab13279 100644 --- a/custom-env/README.md +++ b/custom-env/README.md @@ -2,7 +2,7 @@ Egg will load different config file in different env, in this example we create `config.default.js`, `config.sit.js` and `config.prod.js`. -Egg will load `config.sit.js` when lanched by `EGG_SERVER_ENV=sit npm run dev`. You can get see the response +Egg will load `config.sit.js` when launched by `EGG_SERVER_ENV=sit npm run dev`. You can get see the response ```bash $ curl http://127.0.0.1:7001 diff --git a/custom-env/app/router.js b/custom-env/app/router.js index c0d31dd..aa5ff33 100644 --- a/custom-env/app/router.js +++ b/custom-env/app/router.js @@ -1,5 +1,6 @@ 'use strict'; module.exports = app => { - app.router.get('/', app.controller.home.getEnv); + const { router, controller } = app; + router.get('/', controller.home.getEnv); }; diff --git a/custom-env/package.json b/custom-env/package.json index 3f96a52..1f3f6cc 100644 --- a/custom-env/package.json +++ b/custom-env/package.json @@ -4,11 +4,11 @@ "description": "custom environment", "private": true, "dependencies": { - "egg": "^1.10.1" + "egg": "^2.2.0" }, "devDependencies": { - "egg-bin": "^4.3.5", - "egg-mock": "^3.13.1" + "egg-bin": "^4.3.7", + "egg-mock": "^3.14.0" }, "engines": { "node": ">=8.9.0" diff --git a/download/package.json b/download/package.json index d396201..578cc6c 100644 --- a/download/package.json +++ b/download/package.json @@ -1,11 +1,11 @@ { "name": "download", "dependencies": { - "egg": "^1.10.1" + "egg": "^2.2.0" }, "devDependencies": { - "egg-bin": "^4.3.5", - "egg-mock": "^3.13.1", + "egg-bin": "^4.3.7", + "egg-mock": "^3.14.0", "supertest": "^3.0.0" }, "scripts": { diff --git a/framework/app/package.json b/framework/app/package.json index 63f302a..df0f814 100644 --- a/framework/app/package.json +++ b/framework/app/package.json @@ -2,11 +2,12 @@ "name": "framework-example", "version": "1.0.0", "dependencies": { - "yadan": "../yadan" + "egg": "^2.2.0", + "yadan": "^2.0.0" }, "devDependencies": { - "egg-bin": "^4.3.5", - "egg-mock": "^3.13.1" + "egg-bin": "^4.3.7", + "egg-mock": "^3.14.0" }, "scripts": { "dev": "egg-bin dev", diff --git a/framework/yadan/package.json b/framework/yadan/package.json index 5650887..66c0f4e 100644 --- a/framework/yadan/package.json +++ b/framework/yadan/package.json @@ -2,12 +2,12 @@ "name": "yadan", "version": "1.0.0", "dependencies": { - "egg": "^1.10.1", + "egg": "^2.2.0", "egg-view-nunjucks": "^2.1.4" }, "devDependencies": { - "egg-bin": "^4.3.5", - "egg-mock": "^3.13.1" + "egg-bin": "^4.3.7", + "egg-mock": "^3.14.0" }, "engines": { "node": ">=8.9.0" diff --git a/hackernews-async-ts/package.json b/hackernews-async-ts/package.json index 201f4c1..5e8743b 100644 --- a/hackernews-async-ts/package.json +++ b/hackernews-async-ts/package.json @@ -4,12 +4,7 @@ "description": "hackernews showcase using async/await for egg", "private": true, "dependencies": { - "egg": "^2.0.0", - "egg-view-nunjucks": "^2.1.4", - "moment": "^2.19.4", - "source-map-support": "^0.5.0", - "tslib": "^1.8.1", - "typescript": "^2.6.2" + "egg": "^2.2.0" }, "devDependencies": { "@types/cheerio": "^0.22.1", diff --git a/hackernews/package.json b/hackernews/package.json index 6404dd2..2411841 100644 --- a/hackernews/package.json +++ b/hackernews/package.json @@ -4,16 +4,16 @@ "description": "hackernews showcase using async/await for egg", "private": true, "dependencies": { - "egg": "^2.0.0", + "egg": "^2.2.0", "egg-view-nunjucks": "^2.1.4", - "moment": "^2.19.2" + "moment": "^2.20.1" }, "devDependencies": { "autod": "^3.0.1", "autod-egg": "^1.0.0", "cheerio": "^1.0.0-rc.2", - "egg-bin": "^4.3.5", - "egg-mock": "^3.13.1", + "egg-bin": "^4.3.7", + "egg-mock": "^3.14.0", "eslint": "^4.12.0", "eslint-config-egg": "^5.1.1" }, diff --git a/helloworld/package.json b/helloworld/package.json index 800cf2f..d3dc5ad 100644 --- a/helloworld/package.json +++ b/helloworld/package.json @@ -1,11 +1,11 @@ { "name": "helloworld", "dependencies": { - "egg": "^1.10.1" + "egg": "^2.2.0" }, "devDependencies": { - "egg-bin": "^4.3.5", - "egg-mock": "^3.13.1" + "egg-bin": "^4.3.7", + "egg-mock": "^3.14.0" }, "scripts": { "dev": "egg-bin dev", diff --git a/httpclient/package.json b/httpclient/package.json index 52ba80c..5773290 100644 --- a/httpclient/package.json +++ b/httpclient/package.json @@ -1,11 +1,11 @@ { "name": "httpclient-example", "dependencies": { - "egg": "^1.10.1", + "egg": "^2.2.0", "formstream": "^1.1.0" }, "devDependencies": { - "egg-bin": "^4.3.5" + "egg-bin": "^4.3.7" }, "scripts": { "start": "egg-bin dev", diff --git a/ipc/package.json b/ipc/package.json index 5b6349c..4bc05d3 100644 --- a/ipc/package.json +++ b/ipc/package.json @@ -4,11 +4,11 @@ "description": "egg ipc example", "private": true, "dependencies": { - "egg": "^1.10.1", + "egg": "^2.2.0", "mz-modules": "^2.0.0" }, "devDependencies": { - "egg-bin": "^4.3.5" + "egg-bin": "^4.3.7" }, "engines": { "node": ">=8.9.0" diff --git a/middleware/package.json b/middleware/package.json index e476397..53df3b9 100644 --- a/middleware/package.json +++ b/middleware/package.json @@ -1,11 +1,11 @@ { "name": "middleware-example", "dependencies": { - "egg": "^1.10.1" + "egg": "^2.2.0" }, "devDependencies": { - "egg-bin": "^4.3.5", - "egg-mock": "^3.13.1" + "egg-bin": "^4.3.7", + "egg-mock": "^3.14.0" }, "scripts": { "dev": "egg-bin dev", diff --git a/multipart/package.json b/multipart/package.json index 67529ad..f3346b4 100644 --- a/multipart/package.json +++ b/multipart/package.json @@ -2,15 +2,15 @@ "name": "multipart-example", "dependencies": { "await-stream-ready": "^1.0.1", - "egg": "^1.10.1", + "egg": "^2.2.0", "egg-view-nunjucks": "^2.1.4", "mz": "^2.7.0", "stream-to-array": "^2.3.0", "stream-wormhole": "^1.0.3" }, "devDependencies": { - "egg-bin": "^4.3.5", - "egg-mock": "^3.13.1", + "egg-bin": "^4.3.7", + "egg-mock": "^3.14.0", "mz-modules": "^2.0.0" }, "scripts": { diff --git a/passport/package.json b/passport/package.json index 7baaa87..2b7f5a2 100644 --- a/passport/package.json +++ b/passport/package.json @@ -1,15 +1,15 @@ { "name": "passport", "dependencies": { - "egg": "^1.10.1", - "egg-passport": "^1.0.0", + "egg": "^2.2.0", + "egg-passport": "^2.0.1", "egg-passport-bitbucket": "^1.0.0", "egg-passport-github": "^1.0.0", "egg-passport-twitter": "^1.0.0", "egg-passport-weibo": "^1.0.0" }, "devDependencies": { - "egg-bin": "^4.3.5" + "egg-bin": "^4.3.7" }, "scripts": { "dev": "egg-bin dev", diff --git a/progressive/step1/package.json b/progressive/step1/package.json index 8dfd4be..f584aa3 100644 --- a/progressive/step1/package.json +++ b/progressive/step1/package.json @@ -3,11 +3,11 @@ "version": "1.0.0", "private": true, "dependencies": { - "egg": "^2.0.0" + "egg": "^2.2.0" }, "devDependencies": { - "egg-bin": "^4.3.5", - "egg-mock": "^3.13.1" + "egg-bin": "^4.3.7", + "egg-mock": "^3.14.0" }, "scripts": { "dev": "egg-bin dev", diff --git a/progressive/step2/package.json b/progressive/step2/package.json index 8dfd4be..f584aa3 100644 --- a/progressive/step2/package.json +++ b/progressive/step2/package.json @@ -3,11 +3,11 @@ "version": "1.0.0", "private": true, "dependencies": { - "egg": "^2.0.0" + "egg": "^2.2.0" }, "devDependencies": { - "egg-bin": "^4.3.5", - "egg-mock": "^3.13.1" + "egg-bin": "^4.3.7", + "egg-mock": "^3.14.0" }, "scripts": { "dev": "egg-bin dev", diff --git a/progressive/step3/egg-ua/package.json b/progressive/step3/egg-ua/package.json index 67aa15b..7cd17fd 100644 --- a/progressive/step3/egg-ua/package.json +++ b/progressive/step3/egg-ua/package.json @@ -6,12 +6,15 @@ }, "devDependencies": { "egg": "^2.0.0", - "egg-bin": "^4.3.5", - "egg-mock": "^3.13.1" + "egg-bin": "^4.3.7", + "egg-mock": "^3.14.0" }, "scripts": { "dev": "egg-bin dev", "test": "egg-bin test", "cov": "egg-bin cov" + }, + "dependencies": { + "egg": "^2.2.0" } } diff --git a/progressive/step4/egg-ua/package.json b/progressive/step4/egg-ua/package.json index 1d25f57..1d951b0 100644 --- a/progressive/step4/egg-ua/package.json +++ b/progressive/step4/egg-ua/package.json @@ -6,12 +6,15 @@ }, "devDependencies": { "egg": "^1.0.0", - "egg-bin": "^4.3.5", - "egg-mock": "^3.13.1" + "egg-bin": "^4.3.7", + "egg-mock": "^3.14.0" }, "scripts": { "dev": "egg-bin dev", "test": "egg-bin test", "cov": "egg-bin cov" + }, + "dependencies": { + "egg": "^2.2.0" } } diff --git a/redefine-controller/package.json b/redefine-controller/package.json index df070ca..c485c9e 100644 --- a/redefine-controller/package.json +++ b/redefine-controller/package.json @@ -1,11 +1,11 @@ { "name": "redefine-controller", "dependencies": { - "egg": "^1.10.1" + "egg": "^2.2.0" }, "devDependencies": { - "egg-bin": "^4.3.5", - "egg-mock": "^3.13.1" + "egg-bin": "^4.3.7", + "egg-mock": "^3.14.0" }, "scripts": { "test": "egg-bin test", diff --git a/schedule/package.json b/schedule/package.json index 6c669a3..b8273da 100644 --- a/schedule/package.json +++ b/schedule/package.json @@ -1,11 +1,11 @@ { "name": "schedule-example", "dependencies": { - "egg": "^1.10.1" + "egg": "^2.2.0" }, "devDependencies": { - "egg-bin": "^4.3.5", - "egg-mock": "^3.13.1" + "egg-bin": "^4.3.7", + "egg-mock": "^3.14.0" }, "scripts": { "dev": "egg-bin dev", diff --git a/sequelize-example/package.json b/sequelize-example/package.json index 30fec37..06aea7e 100644 --- a/sequelize-example/package.json +++ b/sequelize-example/package.json @@ -4,14 +4,13 @@ "description": "The egg example project that uses egg-sequelize plugin.", "private": true, "dependencies": { - "egg": "^1.4.0", - "egg-sequelize": "^3.0.1", - "pg": "^6.2.4", - "pg-hstore": "^2.3.2" + "co": "^4.6.0", + "egg": "^2.2.0", + "egg-sequelize": "^3.1.0" }, "devDependencies": { - "egg-bin": "^3.4.2", - "egg-mock": "^3.7.2", + "egg-bin": "^4.3.7", + "egg-mock": "^3.14.0", "lodash": "^4.17.4" }, "engines": { diff --git a/static/package.json b/static/package.json index 9e492e7..ee0e58b 100644 --- a/static/package.json +++ b/static/package.json @@ -1,11 +1,11 @@ { "name": "static-example", "dependencies": { - "egg": "^1.10.1" + "egg": "^2.2.0" }, "devDependencies": { - "egg-bin": "^4.3.5", - "egg-mock": "^3.13.1" + "egg-bin": "^4.3.7", + "egg-mock": "^3.14.0" }, "scripts": { "dev": "egg-bin dev", diff --git a/unittest/package.json b/unittest/package.json index fd63952..0ba7800 100644 --- a/unittest/package.json +++ b/unittest/package.json @@ -1,12 +1,12 @@ { "name": "unittest-example", "dependencies": { - "egg": "^1.10.1", + "egg": "^2.2.0", "ylru": "^1.2.0" }, "devDependencies": { - "egg-bin": "^4.3.5", - "egg-mock": "^3.13.1" + "egg-bin": "^4.3.7", + "egg-mock": "^3.14.0" }, "scripts": { "dev": "egg-bin dev", diff --git a/view-nunjucks/package.json b/view-nunjucks/package.json index 1b560b0..5bba76c 100644 --- a/view-nunjucks/package.json +++ b/view-nunjucks/package.json @@ -1,12 +1,12 @@ { "name": "view-nunjucks-example", "dependencies": { - "egg": "^1.10.1", + "egg": "^2.2.0", "egg-view-nunjucks": "^2.1.4" }, "devDependencies": { - "egg-bin": "^4.3.5", - "egg-mock": "^3.13.1" + "egg-bin": "^4.3.7", + "egg-mock": "^3.14.0" }, "scripts": { "dev": "egg-bin dev",