From 17c10a4edbeb8bdec6bd0e008351937d015bb177 Mon Sep 17 00:00:00 2001 From: Jordan Harband Date: Sun, 24 Jun 2018 00:15:25 -0700 Subject: [PATCH 1/4] test: clean up test matrix --- .travis.yml | 23 ++++++++--------------- 1 file changed, 8 insertions(+), 15 deletions(-) diff --git a/.travis.yml b/.travis.yml index 76598af..1031453 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,29 +3,22 @@ language: node_js notifications: email: false node_js: - - 'node' - - '7' + - '10' + - '8' - '6' - '4' before_script: - - 'if [ -n "${TEST_ESLINT_3-}" ]; then npm install eslint@^3.12.0; fi' - - npm prune + - 'if [ -n "${ESLINT-}" ]; then npm install --no-save "eslint@${ESLINT}"; fi' + - npm ls > /dev/null script: - 'if [ -n "${LINTONLY-}" ]; then npm run lint; else npm run cover && npm run check-coverage; fi' after_success: - npm run travis-after-all +env: + matrix: + - ESLINT=4 + - ESLINT=3 matrix: include: - - node_js: "node" - env: TEST_ESLINT_3=true - - node_js: "7" - env: TEST_ESLINT_3=true - - node_js: "6" - env: TEST_ESLINT_3=true - - node_js: "4" - env: TEST_ESLINT_3=true - node_js: "node" env: LINTONLY=true -branches: - only: - - master From fc9dfeb9e16745d5a7877e06c5e1d07a79999544 Mon Sep 17 00:00:00 2001 From: Jordan Harband Date: Sun, 24 Jun 2018 00:28:32 -0700 Subject: [PATCH 2/4] chore: Only apps should have lockfiles --- .gitignore | 4 ++++ .npmrc | 1 + 2 files changed, 5 insertions(+) create mode 100644 .npmrc diff --git a/.gitignore b/.gitignore index 168f947..a079e66 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,7 @@ coverage/ dist/ .opt-in +# Only apps should have lockfiles +npm-shrinkwrap.json +package-lock.json +yarn.lock diff --git a/.npmrc b/.npmrc new file mode 100644 index 0000000..43c97e7 --- /dev/null +++ b/.npmrc @@ -0,0 +1 @@ +package-lock=false From cd5fedb9d92b645c0010a7d92b21ee9e4984b027 Mon Sep 17 00:00:00 2001 From: Jordan Harband Date: Sun, 24 Jun 2018 00:15:48 -0700 Subject: [PATCH 3/4] feat: add eslint v5 support --- .travis.yml | 4 ++++ package.json | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 1031453..6aee27f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -16,9 +16,13 @@ after_success: - npm run travis-after-all env: matrix: + - ESLINT=5 - ESLINT=4 - ESLINT=3 matrix: include: - node_js: "node" env: LINTONLY=true + exclude: + - node_js: "4" + env: ESLINT=5 diff --git a/package.json b/package.json index aa3116c..dc8be7c 100644 --- a/package.json +++ b/package.json @@ -45,7 +45,7 @@ "codecov": "^2.2.0", "commitizen": "^2.9.6", "cz-conventional-changelog": "^2.0.0", - "eslint": "^3.12.0 || ^4.0.0", + "eslint": "^3.12.0 || ^4 || ^5", "ghooks": "^2.0.0", "mocha": "^3.0.1", "npm-run-all": "^4.0.2", @@ -60,7 +60,7 @@ "xo": "^0.18.2" }, "peerDependencies": { - "eslint": "^3.12.0 || ^4.0.0" + "eslint": "^3.12.0 || ^4 || ^5" }, "nyc": { "exclude": [ From 8066cc286198dff2e303fcc8c8f5608c3cefcce3 Mon Sep 17 00:00:00 2001 From: Jordan Harband Date: Sun, 24 Jun 2018 09:57:12 -0700 Subject: [PATCH 4/4] chore(test): add missing ajv peer dep, transitively required by `inquirer` --- .travis.yml | 7 ++++--- package.json | 1 + 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 6aee27f..5d7c9e3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,6 +9,7 @@ node_js: - '4' before_script: - 'if [ -n "${ESLINT-}" ]; then npm install --no-save "eslint@${ESLINT}"; fi' + - 'if [ -n "${AJV-}" ]; then npm install --no-save "ajv@${AJV}"; fi' - npm ls > /dev/null script: - 'if [ -n "${LINTONLY-}" ]; then npm run lint; else npm run cover && npm run check-coverage; fi' @@ -16,8 +17,8 @@ after_success: - npm run travis-after-all env: matrix: - - ESLINT=5 - - ESLINT=4 + - ESLINT=5 AJV=6 + - ESLINT=4 AJV=5 - ESLINT=3 matrix: include: @@ -25,4 +26,4 @@ matrix: env: LINTONLY=true exclude: - node_js: "4" - env: ESLINT=5 + env: ESLINT=5 AJV=6 diff --git a/package.json b/package.json index dc8be7c..615113e 100644 --- a/package.json +++ b/package.json @@ -38,6 +38,7 @@ "yargs": "^8.0.1" }, "devDependencies": { + "ajv": "^5 || ^6", "all-contributors-cli": "^4.3.0", "babel-cli": "^6.24.1", "babel-core": "^6.25.0",