Skip to content

Commit 90b8f36

Browse files
committed
Merge branch 'beta' into feature/new-eslint-rules
2 parents be88ce0 + a2f35d6 commit 90b8f36

File tree

4 files changed

+96
-43
lines changed

4 files changed

+96
-43
lines changed

README.md

Lines changed: 57 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,31 @@
11
<div align="center">
22
<br>
3-
<img width="200" src="https://user-images.githubusercontent.com/288160/95671736-22da8400-0b4f-11eb-953c-339440756a3d.png" alt="Hover Web">
3+
<img width="200" src="https://user-images.githubusercontent.com/288160/95674568-ed8d6080-0b65-11eb-88be-d119c88ee285.png" alt="Hover Web">
44
<br>
55
<h1>hover-javascript</h1>
6-
<p>CLI toolbox for common scripts for <strong>JavaScript</strong> and <strong>TypeScript</strong> projects</p></div>
6+
<p>🧰 Toolbox of scripts and configurations for <strong>JavaScript</strong> and <strong>TypeScript</strong> projects</p></div>
77

8-
---
8+
<div align="center">
9+
10+
[![Build Status][build-badge]][build-link]
11+
[![Code Coverage][coverage-badge]][coverage-link]
12+
[![Version][package-badge]][package-link]
13+
[![Maintenance][maintenance-badge]][maintenance-link]
14+
[![Node Version][node-badge]][node-link]
15+
[![MIT License][license-badge]][license-link]
16+
[![Code Style][prettier-badge]][prettier-link]
17+
[![Conventional Commits][conventional-commits-badge]][conventional-commits-link]
18+
19+
</div>
920

10-
[![Build Status][build-badge]][build]
11-
[![Code Coverage][coverage-badge]][coverage]
12-
[![Dependabot Status][dependabot-badge]][dependabot]
13-
[![version][version-badge]][package] [![MIT License][license-badge]][license]
21+
<br>
22+
23+
## ✨ Features
1424

15-
This is a CLI that abstracts away all configuration for ~~my~~ **our** open
16-
source projects for linting, testing, building, and more.
25+
- 📦 One package to encapsulate most tooling dependencies
26+
- ⚙️ Common (extensible) configurations to eliminate boilerplate
27+
- 📏 Conventions that help enforce consistency
28+
- 🥽 Best practices to help avoid 🦶🏻🔫
1729

1830
## Contents
1931

@@ -23,14 +35,19 @@ source projects for linting, testing, building, and more.
2335
- [Installation](#installation)
2436
- [Usage](#usage)
2537
- [Overriding Config](#overriding-config)
26-
- [LICENSE](#license)
38+
- [ESLint](#eslint)
39+
- [Prettier](#prettier)
40+
- [Jest](#jest)
41+
- [License](#license)
42+
- [Maintenance](#maintenance)
2743

2844
<!-- END doctoc generated TOC please keep comment here to allow auto update -->
2945

3046
## Installation
3147

32-
This module is distributed via [npm][npm] which is bundled with [node][node] and
33-
should be installed as one of your project's `devDependencies`:
48+
This module is distributed via [npm][npm-link] which is bundled with
49+
[node][node-link] and should be installed as one of your project's
50+
`devDependencies`:
3451

3552
```
3653
yarn add -D @hover/javascript
@@ -58,6 +75,10 @@ and override only the parts of the config you need to.
5875
This can be a very helpful way to make editor integration work for tools like
5976
ESLint which require project-based ESLint configuration to be present to work.
6077

78+
> Note: `hover-scripts` intentionally does not merge things for you when you
79+
> start configuring things to make it less magical and more straightforward.
80+
> Extending can take place on your terms.
81+
6182
#### ESLint
6283

6384
So, if we were to do this for ESLint, you could create an `.eslintrc.js` with
@@ -97,32 +118,39 @@ module.exports = {
97118
}
98119
```
99120

100-
> Note: `hover-scripts` intentionally does not merge things for you when you
101-
> start configuring things to make it less magical and more straightforward.
102-
> Extending can take place on your terms. ~~I~~ _Kent_ think[s] this is actually
103-
> a great way to do this.
104-
>
105-
> For the record, so do I (Jamie)
121+
## License
122+
123+
## Maintenance
106124

107-
## LICENSE
125+
This project is actively maintained by engineers at
126+
[@hoverinc][hover-github-link] 😀.
108127

109128
MIT
110129

130+
[hover-github-link]: https://github.com/hoverinc
131+
[node-link]: https://nodejs.org
132+
[npm-link]: https://www.npmjs.com/
111133
[react-scripts-link]:
112134
https://github.com/facebook/create-react-app/tree/master/packages/react-scripts
113-
[npm]: https://www.npmjs.com/
114-
[node]: https://nodejs.org
115135
[build-badge]:
116136
https://g.codefresh.io/api/badges/pipeline/hoverinc/npm%2Fjavascript?type=cf-1
117-
[build]:
137+
[build-link]:
118138
https://g.codefresh.io/public/accounts/hoverinc/pipelines/5d4cb5d4e41f3722d4dfdb94
139+
[conventional-commits-badge]:
140+
https://img.shields.io/badge/Conventional%20Commits-1.0.0-yellow.svg
141+
[conventional-commits-link]: https://conventionalcommits.org
142+
[coverage-link]: https://codecov.io/github/hoverinc/hover-javascript
119143
[coverage-badge]:
120144
https://img.shields.io/codecov/c/github/hoverinc/hover-javascript.svg
121-
[coverage]: https://codecov.io/github/hoverinc/hover-javascript
122-
[dependabot-badge]:
123-
https://api.dependabot.com/badges/status?host=github&repo=hoverinc/hover-javascript
124-
[dependabot]: https://dependabot.com
125-
[version-badge]: https://img.shields.io/npm/v/@hover/javascript.svg
126-
[package]: https://www.npmjs.com/package/@hover/javascript
145+
[maintenance-badge]:
146+
https://img.shields.io/badge/maintenance-active-247ddc?logo=data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABkAAAAcCAYAAACUJBTQAAAB1ElEQVRIibWWPUtdQRCGH0VNF/wCCVjYCxr/gZWdhYVgLQYbm/wACTYxxA8SSBDtbKwUbfQWkiJFAgkkmHBBY6U2CXaCGlDDG1buxePOnt17bsgD28zOzjtnZvbuRVKR1SFpVdKepEe1njOGnOWCz0q60B1lSa05/oVE2iTNSfqdCZ7lSyWB0NmkSJekeUmXJqzlayWZUJxckUUTJs23mFAjlhNjSdMHfAQ6g54hZUnDdXyN44ek7iKNH4w0PMaeX7pQ8Ox6HQkWww3Dw1hPWoAJ4BxoB4aNR5oB4APQ5vekUdITSceZDLcreyORrGPcfpEL0CBpVNJRwLmUSWLS7NbGpju8FXEteT2qR+jQ9aS3QK2XgUljjXPpRC6iLpYV4KmxRghNVy28Aqb+t4jjLbBhrAH+RcRxZSwBUiINxlIHKZE/xlIHTTlHBDwHjoDPwHtgF/gEnBnvFJVfzSrXkpYyfxKGvIu14F3ONXP1LOWmzEPjpuWl92j55XyQyDnEjRN5AbwD9gMOPkV7tAPMOJE3ZuuOFmOpjS3gGfCdQDl8fgGnGVtzwt8F7wdGqgKOvOmq4iarB3gMjAFlb78qug5MAwehIO4tKViJe4wDP4FSrgfwF/ntR8JxRSf3AAAAAElFTkSuQmCC
147+
[maintenance-link]: https://github.com/hoverinc/hover-javascript#maintenance
127148
[license-badge]: https://img.shields.io/npm/l/@hover/javascript.svg
128-
[license]: https://github.com/hoverinc/hover-javascript/blob/master/LICENSE
149+
[license-link]: https://github.com/hoverinc/hover-javascript/blob/master/LICENSE
150+
[node-link]: https://nodejs.org/en/download/
151+
[node-badge]: https://img.shields.io/badge/node-v12.18.4-green
152+
[prettier-badge]:
153+
https://img.shields.io/badge/code_style-prettier-ff69b4.svg?logo=prettier
154+
[prettier-link]: https://prettierjs.org/en/download/
155+
[package-badge]: https://img.shields.io/npm/v/@hover/javascript.svg
156+
[package-link]: https://www.npmjs.com/package/@hover/javascript

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
"license": "MIT",
5151
"dependencies": {
5252
"@commitlint/cli": "^11.0.0",
53-
"@commitlint/config-conventional": "^9.1.2",
53+
"@commitlint/config-conventional": "^11.0.0",
5454
"@commitlint/prompt": "^11.0.0",
5555
"@types/jest": "^26.0.14",
5656
"@typescript-eslint/eslint-plugin": "^4.4.0",
@@ -90,7 +90,7 @@
9090
"semver": "^7.1.3",
9191
"typescript": "^4.0.3",
9292
"which": "^2.0.2",
93-
"yargs-parser": "^18.1.3"
93+
"yargs-parser": "^20.2.1"
9494
},
9595
"eslintConfig": {
9696
"extends": [

src/config/lintstagedrc.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ const hoverScripts = resolveHoverScripts()
44
const doctoc = resolveBin('doctoc')
55

66
module.exports = {
7-
'README.md': [`${doctoc} --maxlevel 3 --notitle`],
7+
'README.md': [`${doctoc} --maxlevel 4 --notitle`],
88
'*.+(js|jsx|json|yml|yaml|css|less|scss|ts|tsx|md|graphql|mdx|vue)': [
99
`${hoverScripts} format`,
1010
],

yarn.lock

Lines changed: 36 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -897,12 +897,12 @@
897897
resolve-global "1.0.0"
898898
yargs "^15.1.0"
899899

900-
"@commitlint/config-conventional@^9.1.2":
901-
version "9.1.2"
902-
resolved "https://registry.yarnpkg.com/@commitlint/config-conventional/-/config-conventional-9.1.2.tgz#9920ad60a2ac64eedad01845b331c970cf854a71"
903-
integrity sha512-2zfnsrBJuCNJEKMEmltYlCUEoQNE4anvEBI/SYEuiB1JYXYaELijobDBpqhUVjh5NEpprNTY16oMZat6ewnxOg==
900+
"@commitlint/config-conventional@^11.0.0":
901+
version "11.0.0"
902+
resolved "https://registry.yarnpkg.com/@commitlint/config-conventional/-/config-conventional-11.0.0.tgz#3fa300a1b639273946de3c3f15e1cda518333422"
903+
integrity sha512-SNDRsb5gLuDd2PL83yCOQX6pE7gevC79UPFx+GLbLfw6jGnnbO9/tlL76MLD8MOViqGbo7ZicjChO9Gn+7tHhA==
904904
dependencies:
905-
conventional-changelog-conventionalcommits "4.3.0"
905+
conventional-changelog-conventionalcommits "^4.3.1"
906906

907907
"@commitlint/ensure@^11.0.0":
908908
version "11.0.0"
@@ -2891,6 +2891,14 @@ compare-func@^1.3.1:
28912891
array-ify "^1.0.0"
28922892
dot-prop "^3.0.0"
28932893

2894+
compare-func@^2.0.0:
2895+
version "2.0.0"
2896+
resolved "https://registry.yarnpkg.com/compare-func/-/compare-func-2.0.0.tgz#fb65e75edbddfd2e568554e8b5b05fff7a51fcb3"
2897+
integrity sha512-zHig5N+tPWARooBnb0Zx1MFcdfpyJrfTJ3Y5L+IFvUm8rM74hHz66z0gw0x4tijh5CorKkKUCnW82R2vmpeCRA==
2898+
dependencies:
2899+
array-ify "^1.0.0"
2900+
dot-prop "^5.1.0"
2901+
28942902
compare-versions@^3.6.0:
28952903
version "3.6.0"
28962904
resolved "https://registry.yarnpkg.com/compare-versions/-/compare-versions-3.6.0.tgz#1a5689913685e5a87637b8d3ffca75514ec41d62"
@@ -2959,12 +2967,12 @@ conventional-changelog-angular@^5.0.0:
29592967
compare-func "^1.3.1"
29602968
q "^1.5.1"
29612969

2962-
2963-
version "4.3.0"
2964-
resolved "https://registry.yarnpkg.com/conventional-changelog-conventionalcommits/-/conventional-changelog-conventionalcommits-4.3.0.tgz#c4205a659f7ca9d7881f29ee78a4e7d6aeb8b3c2"
2965-
integrity sha512-oYHydvZKU+bS8LnGqTMlNrrd7769EsuEHKy4fh1oMdvvDi7fem8U+nvfresJ1IDB8K00Mn4LpiA/lR+7Gs6rgg==
2970+
conventional-changelog-conventionalcommits@^4.3.1:
2971+
version "4.4.0"
2972+
resolved "https://registry.yarnpkg.com/conventional-changelog-conventionalcommits/-/conventional-changelog-conventionalcommits-4.4.0.tgz#8d96687141c9bbd725a89b95c04966d364194cd4"
2973+
integrity sha512-ybvx76jTh08tpaYrYn/yd0uJNLt5yMrb1BphDe4WBredMlvPisvMghfpnJb6RmRNcqXeuhR6LfGZGewbkRm9yA==
29662974
dependencies:
2967-
compare-func "^1.3.1"
2975+
compare-func "^2.0.0"
29682976
lodash "^4.17.15"
29692977
q "^1.5.1"
29702978

@@ -3421,6 +3429,13 @@ dot-prop@^3.0.0:
34213429
dependencies:
34223430
is-obj "^1.0.0"
34233431

3432+
dot-prop@^5.1.0:
3433+
version "5.3.0"
3434+
resolved "https://registry.yarnpkg.com/dot-prop/-/dot-prop-5.3.0.tgz#90ccce708cd9cd82cc4dc8c3ddd9abdd55b20e88"
3435+
integrity sha512-QM8q3zDe58hqUqjraQOmzZ1LIH9SWQJTlEKCH4kJ2oQvLZk7RbQXvtDM2XEq3fwkV9CCvvH4LA0AV+ogFsBM2Q==
3436+
dependencies:
3437+
is-obj "^2.0.0"
3438+
34243439
duplexify@^3.4.2, duplexify@^3.6.0:
34253440
version "3.7.1"
34263441
resolved "https://registry.yarnpkg.com/duplexify/-/duplexify-3.7.1.tgz#2a4df5317f6ccfd91f86d6fd25d8d8a103b88309"
@@ -5103,6 +5118,11 @@ is-obj@^1.0.0, is-obj@^1.0.1:
51035118
resolved "https://registry.yarnpkg.com/is-obj/-/is-obj-1.0.1.tgz#3e4729ac1f5fde025cd7d83a896dab9f4f67db0f"
51045119
integrity sha1-PkcprB9f3gJc19g6iW2rn09n2w8=
51055120

5121+
is-obj@^2.0.0:
5122+
version "2.0.0"
5123+
resolved "https://registry.yarnpkg.com/is-obj/-/is-obj-2.0.0.tgz#473fb05d973705e3fd9620545018ca8e22ef4982"
5124+
integrity sha512-drqDG3cbczxxEJRoOXcOjtdp1J/lyp1mNn0xaznRs8+muBhgQcrnbspox5X5fOw0HnMnbfDzvnEMEtqDEJEo8w==
5125+
51065126
is-plain-obj@^1.1.0:
51075127
version "1.1.0"
51085128
resolved "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-1.1.0.tgz#71a50c8429dfca773c92a390a4a03b39fcd51d3e"
@@ -9130,14 +9150,19 @@ yargs-parser@^13.1.2:
91309150
camelcase "^5.0.0"
91319151
decamelize "^1.2.0"
91329152

9133-
yargs-parser@^18.1.2, yargs-parser@^18.1.3:
9153+
yargs-parser@^18.1.2:
91349154
version "18.1.3"
91359155
resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-18.1.3.tgz#be68c4975c6b2abf469236b0c870362fab09a7b0"
91369156
integrity sha512-o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ==
91379157
dependencies:
91389158
camelcase "^5.0.0"
91399159
decamelize "^1.2.0"
91409160

9161+
yargs-parser@^20.2.1:
9162+
version "20.2.1"
9163+
resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.1.tgz#28f3773c546cdd8a69ddae68116b48a5da328e77"
9164+
integrity sha512-yYsjuSkjbLMBp16eaOt7/siKTjNVjMm3SoJnIg3sEh/JsvqVVDyjRKmaJV4cl+lNIgq6QEco2i3gDebJl7/vLA==
9165+
91419166
yargs@^13.3.0:
91429167
version "13.3.2"
91439168
resolved "https://registry.yarnpkg.com/yargs/-/yargs-13.3.2.tgz#ad7ffefec1aa59565ac915f82dccb38a9c31a2dd"

0 commit comments

Comments
 (0)