Skip to content
This repository was archived by the owner on May 26, 2022. It is now read-only.

Commit dd6c1c0

Browse files
author
Adam
committed
use correct husky version
1 parent faa78b7 commit dd6c1c0

File tree

2 files changed

+49
-37
lines changed

2 files changed

+49
-37
lines changed

package.json

Lines changed: 8 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@
5656
"@types/react-dom": "^16.0.5",
5757
"@types/react-redux": "^5.0.16",
5858
"gh-pages": "^1.1.0",
59-
"husky": "^0.14.3",
59+
"husky": "^1.0.0-rc.2",
6060
"lint-staged": "^7.0.4",
6161
"prettier": "^1.12.0",
6262
"ts-jest": "22.4.2",
@@ -76,22 +76,17 @@
7676
}
7777
},
7878
"jest": {
79-
"collectCoverageFrom": [
80-
"src/**/*.{js,jsx,ts,tsx}"
81-
],
82-
"setupFiles": [
83-
"<rootDir>/config/polyfills.js"
84-
],
85-
"testMatch": [
86-
"<rootDir>/src/**/?(*.)(test).(j|t)s?(x)"
87-
],
79+
"collectCoverageFrom": ["src/**/*.{js,jsx,ts,tsx}"],
80+
"setupFiles": ["<rootDir>/config/polyfills.js"],
81+
"testMatch": ["<rootDir>/src/**/?(*.)(test).(j|t)s?(x)"],
8882
"testEnvironment": "node",
8983
"testURL": "http://localhost",
9084
"transform": {
9185
"^.+\\.(js|jsx)$": "<rootDir>/node_modules/babel-jest",
9286
"^.+\\.tsx?$": "<rootDir>/config/jest/typescriptTransform.js",
9387
"^.+\\.css$": "<rootDir>/config/jest/cssTransform.js",
94-
"^(?!.*\\.(js|jsx|mjs|css|json)$)": "<rootDir>/config/jest/fileTransform.js"
88+
"^(?!.*\\.(js|jsx|mjs|css|json)$)":
89+
"<rootDir>/config/jest/fileTransform.js"
9590
},
9691
"transformIgnorePatterns": [
9792
"[/\\\\]node_modules[/\\\\].+\\.(js|jsx|ts|tsx)$"
@@ -100,24 +95,15 @@
10095
"^react-native$": "react-native-web",
10196
"@state/(.*)": "<rootDir>/src/state/$1"
10297
},
103-
"moduleFileExtensions": [
104-
"ts",
105-
"tsx",
106-
"js",
107-
"jsx",
108-
"json"
109-
],
98+
"moduleFileExtensions": ["ts", "tsx", "js", "jsx", "json"],
11099
"globals": {
111100
"ts-jest": {
112101
"tsConfigFile": "tsconfig.test.json"
113102
}
114103
}
115104
},
116105
"lint-staged": {
117-
"*.{ts,tsx,json}": [
118-
"yarn format",
119-
"git add"
120-
]
106+
"*.{ts,tsx,json}": ["yarn format", "git add"]
121107
},
122108
"private": true,
123109
"scripts": {

yarn.lock

Lines changed: 41 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -3597,13 +3597,18 @@ https-browserify@^1.0.0:
35973597
version "1.0.0"
35983598
resolved "https://registry.yarnpkg.com/https-browserify/-/https-browserify-1.0.0.tgz#ec06c10e0a34c0f2faf199f7fd7fc78fffd03c73"
35993599

3600-
husky@^0.14.3:
3601-
version "0.14.3"
3602-
resolved "https://registry.yarnpkg.com/husky/-/husky-0.14.3.tgz#c69ed74e2d2779769a17ba8399b54ce0b63c12c3"
3600+
husky@^1.0.0-rc.2:
3601+
version "1.0.0-rc.2"
3602+
resolved "https://registry.yarnpkg.com/husky/-/husky-1.0.0-rc.2.tgz#a105a26927f7b95aef7d21a305f3cb30a9387fde"
36033603
dependencies:
3604-
is-ci "^1.0.10"
3605-
normalize-path "^1.0.0"
3606-
strip-indent "^2.0.0"
3604+
cosmiconfig "^4.0.0"
3605+
execa "^0.9.0"
3606+
is-ci "^1.1.0"
3607+
pkg-dir "^2.0.0"
3608+
pupa "^1.0.0"
3609+
read-pkg "^3.0.0"
3610+
run-node "^1.0.0"
3611+
slash "^2.0.0"
36073612

36083613
iconv-lite@0.4.19:
36093614
version "0.4.19"
@@ -3781,7 +3786,7 @@ is-callable@^1.1.1, is-callable@^1.1.3:
37813786
version "1.1.3"
37823787
resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.1.3.tgz#86eb75392805ddc33af71c92a0eedf74ee7604b2"
37833788

3784-
is-ci@^1.0.10:
3789+
is-ci@^1.0.10, is-ci@^1.1.0:
37853790
version "1.1.0"
37863791
resolved "https://registry.yarnpkg.com/is-ci/-/is-ci-1.1.0.tgz#247e4162e7860cebbdaf30b774d6b0ac7dcfe7a5"
37873792
dependencies:
@@ -4683,6 +4688,15 @@ load-json-file@^1.0.0:
46834688
pinkie-promise "^2.0.0"
46844689
strip-bom "^2.0.0"
46854690

4691+
load-json-file@^4.0.0:
4692+
version "4.0.0"
4693+
resolved "https://registry.yarnpkg.com/load-json-file/-/load-json-file-4.0.0.tgz#2f5f45ab91e33216234fd53adab668eb4ec0993b"
4694+
dependencies:
4695+
graceful-fs "^4.1.2"
4696+
parse-json "^4.0.0"
4697+
pify "^3.0.0"
4698+
strip-bom "^3.0.0"
4699+
46864700
loader-runner@^2.3.0:
46874701
version "2.3.0"
46884702
resolved "https://registry.yarnpkg.com/loader-runner/-/loader-runner-2.3.0.tgz#f482aea82d543e07921700d5a46ef26fdac6b8a2"
@@ -5271,10 +5285,6 @@ normalize-package-data@^2.3.2, normalize-package-data@^2.3.4:
52715285
semver "2 || 3 || 4 || 5"
52725286
validate-npm-package-license "^3.0.1"
52735287

5274-
normalize-path@^1.0.0:
5275-
version "1.0.0"
5276-
resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-1.0.0.tgz#32d0e472f91ff345701c15a8311018d3b0a90379"
5277-
52785288
normalize-path@^2.0.0, normalize-path@^2.0.1, normalize-path@^2.1.1:
52795289
version "2.1.1"
52805290
resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-2.1.1.tgz#1ab28b556e198363a8c1a6f7e6fa20137fe6aed9"
@@ -6144,6 +6154,10 @@ punycode@^2.1.0:
61446154
version "2.1.0"
61456155
resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.0.tgz#5f863edc89b96db09074bad7947bf09056ca4e7d"
61466156

6157+
pupa@^1.0.0:
6158+
version "1.0.0"
6159+
resolved "https://registry.yarnpkg.com/pupa/-/pupa-1.0.0.tgz#9a9568a5af7e657b8462a6e9d5328743560ceff6"
6160+
61476161
q@^1.1.2:
61486162
version "1.5.1"
61496163
resolved "https://registry.yarnpkg.com/q/-/q-1.5.1.tgz#7e32f75b41381291d04611f1bf14109ac00651d7"
@@ -6403,6 +6417,14 @@ read-pkg@^1.0.0:
64036417
normalize-package-data "^2.3.2"
64046418
path-type "^1.0.0"
64056419

6420+
read-pkg@^3.0.0:
6421+
version "3.0.0"
6422+
resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-3.0.0.tgz#9cbc686978fee65d16c00e2b19c237fcf6e38389"
6423+
dependencies:
6424+
load-json-file "^4.0.0"
6425+
normalize-package-data "^2.3.2"
6426+
path-type "^3.0.0"
6427+
64066428
"readable-stream@1 || 2", readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.4, readable-stream@^2.0.6, readable-stream@^2.1.4, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.2.9, readable-stream@^2.3.3:
64076429
version "2.3.6"
64086430
resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.6.tgz#b11c27d88b8ff1fbe070643cf94b0c79ae1b0aaf"
@@ -6789,6 +6811,10 @@ run-async@^2.2.0:
67896811
dependencies:
67906812
is-promise "^2.1.0"
67916813

6814+
run-node@^1.0.0:
6815+
version "1.0.0"
6816+
resolved "https://registry.yarnpkg.com/run-node/-/run-node-1.0.0.tgz#46b50b946a2aa2d4947ae1d886e9856fd9cabe5e"
6817+
67926818
run-queue@^1.0.0, run-queue@^1.0.3:
67936819
version "1.0.3"
67946820
resolved "https://registry.yarnpkg.com/run-queue/-/run-queue-1.0.3.tgz#e848396f057d223f24386924618e25694161ec47"
@@ -7021,6 +7047,10 @@ slash@^1.0.0:
70217047
version "1.0.0"
70227048
resolved "https://registry.yarnpkg.com/slash/-/slash-1.0.0.tgz#c41f2f6c39fc16d1cd17ad4b5d896114ae470d55"
70237049

7050+
slash@^2.0.0:
7051+
version "2.0.0"
7052+
resolved "https://registry.yarnpkg.com/slash/-/slash-2.0.0.tgz#de552851a1759df3a8f206535442f5ec4ddeab44"
7053+
70247054
slice-ansi@0.0.4:
70257055
version "0.0.4"
70267056
resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-0.0.4.tgz#edbf8903f66f7ce2f8eafd6ceed65e264c831b35"
@@ -7366,10 +7396,6 @@ strip-indent@^1.0.1:
73667396
dependencies:
73677397
get-stdin "^4.0.1"
73687398

7369-
strip-indent@^2.0.0:
7370-
version "2.0.0"
7371-
resolved "https://registry.yarnpkg.com/strip-indent/-/strip-indent-2.0.0.tgz#5ef8db295d01e6ed6cbf7aab96998d7822527b68"
7372-
73737399
strip-json-comments@^2.0.1, strip-json-comments@~2.0.1:
73747400
version "2.0.1"
73757401
resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a"

0 commit comments

Comments
 (0)