Skip to content

Commit 758e470

Browse files
committed
Merge updates from project template
Signed-off-by: Kevin Locke <kevin@kevinlocke.name>
2 parents 4377092 + e78137e commit 758e470

File tree

6 files changed

+44
-31
lines changed

6 files changed

+44
-31
lines changed

.dependabot/config.yml

Lines changed: 0 additions & 16 deletions
This file was deleted.

.github/dependabot.yml

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
# Dependabot Configuration
2+
# https://docs.github.com/code-security/supply-chain-security/configuration-options-for-dependency-updates
3+
#
4+
# FIXME: v2 doesn't support auto-merge. See:
5+
# https://github.com/dependabot/dependabot-core/issues/1823#issuecomment-641594279
6+
# https://github.com/dependabot/dependabot-core/issues/1973#issuecomment-640918321
7+
# https://github.com/dependabot/dependabot-core/issues/2268
8+
# Consider bot:
9+
# https://kodiakhq.com/docs/prior-art-and-alternatives
10+
# Consider GH action:
11+
# https://github.com/dependabot/dependabot-core/issues/2268#issuecomment-654608325
12+
# Must use on: workflow_run or on: pull_request_target to work around
13+
# https://github.com/dependabot/dependabot-core/issues/2268#issuecomment-794745837
14+
version: 2
15+
updates:
16+
- package-ecosystem: "npm"
17+
directory: "/"
18+
schedule:
19+
interval: "daily"
20+
ignore:
21+
# eslint packages must be updated together due to peerDependencies.
22+
# Ignore all but @kevinoid/eslint-config, which declares peerDependencies.
23+
#
24+
# FIXME: Want to ignore updates outside of peerDependencies (usually major).
25+
# If using package-lock.json, want minor/patch.
26+
# Can't currently configure update_type for ignored_updates.
27+
# https://github.com/dependabot/feedback/issues/340#issuecomment-586450312
28+
- dependency-name: "eslint*"

.github/workflows/node.js.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ jobs:
6969
- ubuntu-latest
7070
- windows-latest
7171
node:
72-
- '10'
72+
- '10.17'
7373
- '*'
7474
exclude:
7575
# Exclude os/version already run in test-primary

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
`git-branch-is`
22
===============
33

4-
[![Build Status](https://img.shields.io/github/workflow/status/kevinoid/git-branch-is/Node.js%20CI/master.svg?style=flat&label=build)](https://github.com/kevinoid/git-branch-is/actions?query=branch%3Amaster)
5-
[![Coverage](https://img.shields.io/codecov/c/github/kevinoid/git-branch-is.svg?style=flat)](https://codecov.io/github/kevinoid/git-branch-is?branch=master)
4+
[![Build Status](https://img.shields.io/github/workflow/status/kevinoid/git-branch-is/Node.js%20CI/main.svg?style=flat&label=build)](https://github.com/kevinoid/git-branch-is/actions?query=branch%3Amain)
5+
[![Coverage](https://img.shields.io/codecov/c/github/kevinoid/git-branch-is.svg?style=flat)](https://codecov.io/github/kevinoid/git-branch-is?branch=main)
66
[![Dependency Status](https://img.shields.io/david/kevinoid/git-branch-is.svg?style=flat)](https://david-dm.org/kevinoid/git-branch-is)
77
[![Supported Node Version](https://img.shields.io/node/v/git-branch-is.svg?style=flat)](https://www.npmjs.com/package/git-branch-is)
88
[![Version on NPM](https://img.shields.io/npm/v/git-branch-is.svg?style=flat)](https://www.npmjs.com/package/git-branch-is)

index.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
/**
22
* @copyright Copyright 2016-2020 Kevin Locke <kevin@kevinlocke.name>
33
* @license MIT
4+
* @module git-branch-is
45
*/
56

67
'use strict';

package.json

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,8 @@
2626
],
2727
"main": "index.js",
2828
"exports": {
29-
".": "./index.js"
29+
".": "./index.js",
30+
"./package.json": "./package.json"
3031
},
3132
"bin": {
3233
"git-branch-is": "bin/git-branch-is.js"
@@ -41,16 +42,15 @@
4142
"lint": "npm run lint-js && npm run lint-doc",
4243
"lint-doc": "jsdoc -t templates/silent -c jsdoc-lint.conf.json . && echo JSDoc passed.",
4344
"lint-js": "eslint --report-unused-disable-directives . && echo ESLint passed.",
44-
"postpublish": "git -C doc push && git push --follow-tags origin master gh-pages && echo Remember to update GitHub Releases from CHANGELOG.md",
45+
"postpublish": "git -C doc push && git push --follow-tags origin main gh-pages && echo Remember to update GitHub Releases from CHANGELOG.md",
4546
"postversion": "rimraf doc && git clone -b gh-pages -l -q . doc && npm run doc && git -C doc add . && git -C doc commit -n -m \"Docs for v$npm_package_version\"",
46-
"preversion": "npm run test-cov && nyc check-coverage --statements 95 && depcheck --ignore-dirs doc && david && node ./bin/git-branch-is.js master && hub-ci-status -vv --wait",
47+
"preversion": "npm run test-cov && c8 check-coverage --statements 95 && depcheck --ignore-dirs doc && david && node ./bin/git-branch-is.js main && hub-ci-status -vv --wait",
4748
"test": "npm run lint && npm run test-unit",
4849
"test-cov": "npm run lint && npm run test-unit-cov",
4950
"pretest-unit": "node test-bin/set-up-test-repos.js",
50-
"//": "Note: nyc incompatible with --parallel. See https://github.com/istanbuljs/nyc/issues/1328 and https://github.com/mochajs/mocha/issues/4372",
51-
"test-unit": "node --throw-deprecation --unhandled-rejections=strict node_modules/mocha/bin/mocha --require ./test-lib/root-hooks.js --recursive test",
51+
"test-unit": "node --throw-deprecation --unhandled-rejections=strict node_modules/mocha/bin/mocha --require ./test-lib/root-hooks.js --parallel --recursive test",
5252
"posttest-unit": "rimraf test-repos",
53-
"test-unit-cov": "nyc --reporter=lcov --reporter=text npm run test-unit",
53+
"test-unit-cov": "c8 --reporter=lcov --reporter=text npm run test-unit",
5454
"upload-cov": "codecov < ./coverage/lcov.info && coveralls < ./coverage/lcov.info",
5555
"version": "npm run changelog && echo && echo === Please edit CHANGELOG.md as desired, then exit === && echo && \"${npm_config_shell:-${SHELL:-bash}}\" && git commit -m \"Update CHANGELOG.md for $npm_package_version\" CHANGELOG.md",
5656
"version-deps": "npm install conventional-changelog-cli david depcheck git-branch-is hub-ci-status"
@@ -59,21 +59,21 @@
5959
"commander": "^7.0.0"
6060
},
6161
"devDependencies": {
62-
"@kevinoid/eslint-config": "^15.0.0",
62+
"@kevinoid/eslint-config": "^16.0.0",
63+
"c8": "^7.0.0",
6364
"codecov": "^3.0.0",
6465
"coveralls": "^3.0.0",
6566
"escape-string-regexp": "^4.0.0",
6667
"eslint": "^7.3.0",
6768
"eslint-config-airbnb-base": "^14.2.0",
6869
"eslint-plugin-import": "^2.18.2",
69-
"eslint-plugin-jsdoc": "^31.0.7",
70+
"eslint-plugin-jsdoc": "^32.0.0",
7071
"eslint-plugin-node": "^11.0.0",
7172
"eslint-plugin-promise": "^4.2.1",
72-
"eslint-plugin-unicorn": "^28.0.0",
73+
"eslint-plugin-unicorn": "^29.0.0",
7374
"jsdoc": "^3.6.0",
74-
"mocha": "^8.0.1",
75+
"mocha": "^8.3.0",
7576
"nodecat": "^2.0.0",
76-
"nyc": "^15.0.0",
7777
"rimraf": "^3.0.0"
7878
},
7979
"engines": {
@@ -96,7 +96,7 @@
9696
"checkLeaks": true,
9797
"exit": false
9898
},
99-
"nyc": {
99+
"c8": {
100100
"exclude": [
101101
"test",
102102
"test-bin",

0 commit comments

Comments
 (0)