From dd6582daedc431df33732025654dfae81fd5e5b6 Mon Sep 17 00:00:00 2001 From: Lode Vanhove Date: Thu, 11 Oct 2018 10:13:28 +0200 Subject: [PATCH 1/2] fix(package.json): Update husky & move away from release candidate + fix lint issue where json files --- .all-contributorsrc | 9 +++++++++ .eslintignore | 3 ++- README.md | 4 ++-- package.json | 4 ++-- src/config/lintstagedrc.js | 2 +- 5 files changed, 16 insertions(+), 6 deletions(-) diff --git a/.all-contributorsrc b/.all-contributorsrc index 17d3730f..fd41c420 100644 --- a/.all-contributorsrc +++ b/.all-contributorsrc @@ -111,6 +111,15 @@ "ideas", "review" ] + }, + { + "login": "bitcrumb", + "name": "Lode Vanhove", + "avatar_url": "https://avatars3.githubusercontent.com/u/135126?v=4", + "profile": "https://github.com/bitcrumb", + "contributions": [ + "tool" + ] } ], "repoType": "github" diff --git a/.eslintignore b/.eslintignore index 1320b407..5de0044b 100644 --- a/.eslintignore +++ b/.eslintignore @@ -1,4 +1,5 @@ node_modules coverage dist -README.md \ No newline at end of file +README.md +package.json diff --git a/README.md b/README.md index c39a6103..095eff70 100644 --- a/README.md +++ b/README.md @@ -10,7 +10,7 @@ [![downloads][downloads-badge]][npmcharts] [![MIT License][license-badge]][license] -[![All Contributors](https://img.shields.io/badge/all_contributors-10-orange.svg?style=flat-square)](#contributors) +[![All Contributors](https://img.shields.io/badge/all_contributors-11-orange.svg?style=flat-square)](#contributors) [![PRs Welcome][prs-badge]][prs] [![Code of Conduct][coc-badge]][coc] @@ -163,7 +163,7 @@ Thanks goes to these people ([emoji key][emojis]): | [
Kent C. Dodds](https://kentcdodds.com)
[💻](https://github.com/kentcdodds/@inthepocket/itp-react-scripts/commits?author=kentcdodds "Code") [📖](https://github.com/kentcdodds/@inthepocket/itp-react-scripts/commits?author=kentcdodds "Documentation") [🚇](#infra-kentcdodds "Infrastructure (Hosting, Build-Tools, etc)") [⚠️](https://github.com/kentcdodds/@inthepocket/itp-react-scripts/commits?author=kentcdodds "Tests") | [
Suhas Karanth](https://github.com/sudo-suhas)
[💻](https://github.com/kentcdodds/@inthepocket/itp-react-scripts/commits?author=sudo-suhas "Code") [🐛](https://github.com/kentcdodds/@inthepocket/itp-react-scripts/issues?q=author%3Asudo-suhas "Bug reports") [⚠️](https://github.com/kentcdodds/@inthepocket/itp-react-scripts/commits?author=sudo-suhas "Tests") | [
Matt Parrish](https://github.com/pbomb)
[💻](https://github.com/kentcdodds/@inthepocket/itp-react-scripts/commits?author=pbomb "Code") [⚠️](https://github.com/kentcdodds/@inthepocket/itp-react-scripts/commits?author=pbomb "Tests") | [
Mateus](https://github.com/mateuscb)
[💻](https://github.com/kentcdodds/@inthepocket/itp-react-scripts/commits?author=mateuscb "Code") [⚠️](https://github.com/kentcdodds/@inthepocket/itp-react-scripts/commits?author=mateuscb "Tests") | [
Macklin Underdown](http://macklin.underdown.me)
[💻](https://github.com/kentcdodds/@inthepocket/itp-react-scripts/commits?author=macklinu "Code") [⚠️](https://github.com/kentcdodds/@inthepocket/itp-react-scripts/commits?author=macklinu "Tests") | [
stereobooster](https://github.com/stereobooster)
[💻](https://github.com/kentcdodds/@inthepocket/itp-react-scripts/commits?author=stereobooster "Code") [⚠️](https://github.com/kentcdodds/@inthepocket/itp-react-scripts/commits?author=stereobooster "Tests") | [
Dony Sukardi](http://dsds.io)
[🐛](https://github.com/kentcdodds/@inthepocket/itp-react-scripts/issues?q=author%3Adonysukardi "Bug reports") [💻](https://github.com/kentcdodds/@inthepocket/itp-react-scripts/commits?author=donysukardi "Code") | | :---: | :---: | :---: | :---: | :---: | :---: | :---: | -| [
Alexander Nanberg](https://alexandernanberg.com)
[💻](https://github.com/kentcdodds/@inthepocket/itp-react-scripts/commits?author=alexandernanberg "Code") | [
Easybird](http://easybird.be)
[💻](https://github.com/kentcdodds/@inthepocket/itp-react-scripts/commits?author=easybird "Code") [📖](https://github.com/kentcdodds/@inthepocket/itp-react-scripts/commits?author=easybird "Documentation") [🚇](#infra-easybird "Infrastructure (Hosting, Build-Tools, etc)") | [
Thibault Maekelbergh](http://thibmaek.com)
[💻](https://github.com/kentcdodds/@inthepocket/itp-react-scripts/commits?author=thibmaek "Code") [📖](https://github.com/kentcdodds/@inthepocket/itp-react-scripts/commits?author=thibmaek "Documentation") | +| [
Alexander Nanberg](https://alexandernanberg.com)
[💻](https://github.com/kentcdodds/@inthepocket/itp-react-scripts/commits?author=alexandernanberg "Code") | [
Easybird](http://easybird.be)
[💻](https://github.com/kentcdodds/@inthepocket/itp-react-scripts/commits?author=easybird "Code") [📖](https://github.com/kentcdodds/@inthepocket/itp-react-scripts/commits?author=easybird "Documentation") [🚇](#infra-easybird "Infrastructure (Hosting, Build-Tools, etc)") | [
Thibault Maekelbergh](http://thibmaek.com)
[💻](https://github.com/kentcdodds/@inthepocket/itp-react-scripts/commits?author=thibmaek "Code") [📖](https://github.com/kentcdodds/@inthepocket/itp-react-scripts/commits?author=thibmaek "Documentation") [🤔](#ideas-thibmaek "Ideas, Planning, & Feedback") [👀](#review-thibmaek "Reviewed Pull Requests") | [
Lode Vanhove](https://github.com/bitcrumb)
[🔧](#tool-bitcrumb "Tools") | diff --git a/package.json b/package.json index 7bb02dac..2618719c 100644 --- a/package.json +++ b/package.json @@ -41,8 +41,8 @@ "all-contributors-cli": "^5.0.0", "arrify": "^1.0.1", "babel-cli": "^7.0.0-0", - "babel-eslint": "^9.0.0", "babel-core": "^7.0.0-0", + "babel-eslint": "^9.0.0", "babel-jest": "^23.4.2", "babel-plugin-macros": "^2.3.0", "babel-plugin-minify-dead-code-elimination": "^0.4.0", @@ -65,7 +65,7 @@ "eslint-plugin-react": "^7.11.1", "eslint-plugin-react-native": "^3.2.1", "glob": "^7.1.2", - "husky": "^1.0.0-rc.13", + "husky": "^1.1.2", "is-ci": "^1.1.0", "jest": "^23.4.2", "lint-staged": "^7.0.4", diff --git a/src/config/lintstagedrc.js b/src/config/lintstagedrc.js index ff4ea21b..12ffed6e 100644 --- a/src/config/lintstagedrc.js +++ b/src/config/lintstagedrc.js @@ -8,7 +8,7 @@ module.exports = { linters: { 'README.md': [`${doctoc} --maxlevel 3 --notitle`, 'git add'], '.all-contributorsrc': [`${itpScripts} contributors generate`, 'git add README.md'], - '**/*.+(js|json|less|css|ts|tsx|md)': [ + '**/*.+(json|js|less|css|tsx|ts|md)': [ isOptedOut('autoformat', null, `${itpScripts} format`), `${itpScripts} lint --fix`, `${itpScripts} test --findRelatedTests --passWithNoTests`, From 42025645cbf7db7f35f36b368e60892be68baf61 Mon Sep 17 00:00:00 2001 From: Lode Vanhove Date: Thu, 11 Oct 2018 10:19:04 +0200 Subject: [PATCH 2/2] =?UTF-8?q?fix(lintstagedrc):=20Undo=20the=20fix=20tha?= =?UTF-8?q?t=20wasn't=20a=20fix=20=F0=9F=98=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/config/lintstagedrc.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/config/lintstagedrc.js b/src/config/lintstagedrc.js index 12ffed6e..ff4ea21b 100644 --- a/src/config/lintstagedrc.js +++ b/src/config/lintstagedrc.js @@ -8,7 +8,7 @@ module.exports = { linters: { 'README.md': [`${doctoc} --maxlevel 3 --notitle`, 'git add'], '.all-contributorsrc': [`${itpScripts} contributors generate`, 'git add README.md'], - '**/*.+(json|js|less|css|tsx|ts|md)': [ + '**/*.+(js|json|less|css|ts|tsx|md)': [ isOptedOut('autoformat', null, `${itpScripts} format`), `${itpScripts} lint --fix`, `${itpScripts} test --findRelatedTests --passWithNoTests`,