From d0a17279636dc1e530098a76860ca9eb965ef200 Mon Sep 17 00:00:00 2001 From: fengmk2 Date: Mon, 27 Feb 2017 21:32:24 +0800 Subject: [PATCH 1/3] test: add node 8 --- .travis.yml | 7 +++++++ package.json | 4 ---- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 0a949aa..c62f161 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,6 +5,13 @@ node_js: - '4' - '6' - '7' +matrix: + include: + - node_js: '8' + env: 'NVM_NODEJS_ORG_MIRROR=https://nodejs.org/download/nightly' + allow_failures: + # Allow the nightly installs to fail + - env: 'NVM_NODEJS_ORG_MIRROR=https://nodejs.org/download/nightly' install: - npm i npminstall && npminstall script: diff --git a/package.json b/package.json index 14f0fd6..7bdb91c 100644 --- a/package.json +++ b/package.json @@ -34,7 +34,6 @@ }, "devDependencies": { "egg-bin": "^1.9.1", - "egg-ci": "^1.1.0", "eslint": "^3.12.2", "eslint-config-egg": "^3.2.0", "pedding": "1" @@ -42,9 +41,6 @@ "engines": { "node": ">= 4.0.0" }, - "ci": { - "version": "4.3.2, 4, 6, 7" - }, "author": "fengmk2 (https://fengmk2.com)", "license": "MIT" } From 1efdeea5bc8ecc73cdd6111ebd5a17bbec501bc4 Mon Sep 17 00:00:00 2001 From: fengmk2 Date: Sat, 10 Jun 2017 15:03:46 +0800 Subject: [PATCH 2/3] f --- .autod.conf | 23 +++++++++++++++++++++++ .travis.yml | 8 +------- appveyor.yml | 1 + package.json | 18 ++++++++++++------ 4 files changed, 37 insertions(+), 13 deletions(-) create mode 100644 .autod.conf diff --git a/.autod.conf b/.autod.conf new file mode 100644 index 0000000..ec9956d --- /dev/null +++ b/.autod.conf @@ -0,0 +1,23 @@ +'ues strict'; + +module.exports = { + write: true, + prefix: '^', + devprefix: '^', + exclude: [ + 'test/fixtures', + ], + dep: [ + ], + devdep: [ + 'autod', + 'eslint-config-egg', + 'eslint', + 'egg-bin', + 'egg-ci', + ], + keep: [ + ], + semver: [ + ], +}; diff --git a/.travis.yml b/.travis.yml index c62f161..d4f8a9d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,13 +5,7 @@ node_js: - '4' - '6' - '7' -matrix: - include: - - node_js: '8' - env: 'NVM_NODEJS_ORG_MIRROR=https://nodejs.org/download/nightly' - allow_failures: - # Allow the nightly installs to fail - - env: 'NVM_NODEJS_ORG_MIRROR=https://nodejs.org/download/nightly' + - '8' install: - npm i npminstall && npminstall script: diff --git a/appveyor.yml b/appveyor.yml index 0d6edd2..ccda1b5 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -4,6 +4,7 @@ environment: - nodejs_version: '4' - nodejs_version: '6' - nodejs_version: '7' + - nodejs_version: '8' install: - ps: Install-Product node $env:nodejs_version diff --git a/package.json b/package.json index 7bdb91c..8b547b7 100644 --- a/package.json +++ b/package.json @@ -13,7 +13,8 @@ "test": "egg-bin test", "cov": "egg-bin cov", "ci": "npm run lint && npm run cov", - "lint": "eslint lib test index.js" + "lint": "eslint lib test index.js", + "autod": "autod" }, "repository": { "type": "git", @@ -30,17 +31,22 @@ "agentkeepalive" ], "dependencies": { - "humanize-ms": "^1.2.0" + "humanize-ms": "^1.2.1" }, "devDependencies": { - "egg-bin": "^1.9.1", - "eslint": "^3.12.2", - "eslint-config-egg": "^3.2.0", - "pedding": "1" + "autod": "^2.8.0", + "egg-bin": "^3.4.2", + "egg-ci": "^1.7.0", + "eslint": "^3.19.0", + "eslint-config-egg": "^4.2.0", + "pedding": "^1.1.0" }, "engines": { "node": ">= 4.0.0" }, + "ci": { + "version": "4.3.2, 4, 6, 7, 8" + }, "author": "fengmk2 (https://fengmk2.com)", "license": "MIT" } From dadbd3de4f05d3898eeaee645f42981b5f0df54b Mon Sep 17 00:00:00 2001 From: fengmk2 Date: Sat, 10 Jun 2017 15:07:47 +0800 Subject: [PATCH 3/3] f --- .autod.conf | 1 + package.json | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.autod.conf b/.autod.conf index ec9956d..f33538c 100644 --- a/.autod.conf +++ b/.autod.conf @@ -19,5 +19,6 @@ module.exports = { keep: [ ], semver: [ + 'egg-bin@1', ], }; diff --git a/package.json b/package.json index 8b547b7..a25e33d 100644 --- a/package.json +++ b/package.json @@ -35,7 +35,7 @@ }, "devDependencies": { "autod": "^2.8.0", - "egg-bin": "^3.4.2", + "egg-bin": "^1.10.3", "egg-ci": "^1.7.0", "eslint": "^3.19.0", "eslint-config-egg": "^4.2.0",