Skip to content

Commit

Permalink
Merge branch 'master' into linter
Browse files Browse the repository at this point in the history
  • Loading branch information
@danielbayerlein
danielbayerlein committed Nov 8, 2016
2 parents 906cc3c + 49678f4 commit b8f7b33
Show file tree
Hide file tree
Showing 2 changed files with 118 additions and 118 deletions.
2 changes: 1 addition & 1 deletion package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,6 @@
"eslint-config-airbnb-base": "^9.0.0",
"eslint-formatter-pretty": "^1.1.0",
"eslint-plugin-import": "^2.1.0",
"jest": "^16.0.2"
"jest": "^17.0.0"
}
}
234 changes: 117 additions & 117 deletions yarn.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,7 @@ babel-code-frame@^6.16.0:
esutils "^2.0.2"
js-tokens "^2.0.0"

babel-core@^6.0.0, babel-core@^6.11.4, babel-core@^6.18.0:
babel-core@^6.0.0, babel-core@^6.18.0:
version "6.18.0"
resolved "https://registry.yarnpkg.com/babel-core/-/babel-core-6.18.0.tgz#bb5ce9bc0a956e6e94e2f12d597abb3b0b330deb"
dependencies:
Expand Down Expand Up @@ -215,9 +215,9 @@ babel-helpers@^6.16.0:
babel-runtime "^6.0.0"
babel-template "^6.16.0"

babel-jest@^16.0.0:
version "16.0.0"
resolved "https://registry.yarnpkg.com/babel-jest/-/babel-jest-16.0.0.tgz#348729aea6d624a4774b8a934d07a40dd2cfd640"
babel-jest@^17.0.0:
version "17.0.0"
resolved "https://registry.yarnpkg.com/babel-jest/-/babel-jest-17.0.0.tgz#4dbee762eb2f2ca77c4dacc17eb61f38157b0f01"
dependencies:
babel-core "^6.0.0"
babel-plugin-istanbul "^2.0.0"
Expand Down Expand Up @@ -1512,9 +1512,9 @@ jest-changed-files@^16.0.0:
version "16.0.0"
resolved "https://registry.yarnpkg.com/jest-changed-files/-/jest-changed-files-16.0.0.tgz#7931deff4424182b8173d80e06800d7363b19c45"

jest-cli@^16.0.2:
version "16.0.2"
resolved "https://registry.yarnpkg.com/jest-cli/-/jest-cli-16.0.2.tgz#d439b28affa7189aa3d046d2af931f7ebb9af69d"
jest-cli@^17.0.0:
version "17.0.0"
resolved "https://registry.yarnpkg.com/jest-cli/-/jest-cli-17.0.0.tgz#c2e16575546d2fe875345e40fbf3d1d914bdd7cb"
dependencies:
ansi-escapes "^1.4.0"
callsites "^2.0.0"
Expand All @@ -1525,169 +1525,170 @@ jest-cli@^16.0.2:
istanbul-lib-coverage "^1.0.0"
istanbul-lib-instrument "^1.1.1"
jest-changed-files "^16.0.0"
jest-config "^16.0.2"
jest-environment-jsdom "^16.0.2"
jest-file-exists "^15.0.0"
jest-haste-map "^16.0.2"
jest-jasmine2 "^16.0.2"
jest-mock "^16.0.2"
jest-resolve "^16.0.2"
jest-resolve-dependencies "^16.0.2"
jest-runtime "^16.0.2"
jest-snapshot "^16.0.2"
jest-util "^16.0.2"
jest-config "^17.0.0"
jest-environment-jsdom "^17.0.0"
jest-file-exists "^17.0.0"
jest-haste-map "^17.0.0"
jest-jasmine2 "^17.0.0"
jest-mock "^17.0.0"
jest-resolve "^17.0.0"
jest-resolve-dependencies "^17.0.0"
jest-runtime "^17.0.0"
jest-snapshot "^17.0.0"
jest-util "^17.0.0"
json-stable-stringify "^1.0.0"
node-notifier "^4.6.1"
sane "~1.4.1"
strip-ansi "^3.0.1"
throat "^3.0.0"
which "^1.1.1"
worker-farm "^1.3.1"
yargs "^5.0.0"
yargs "^6.3.0"

jest-config@^16.0.2:
version "16.0.2"
resolved "https://registry.yarnpkg.com/jest-config/-/jest-config-16.0.2.tgz#8e82a9c08846f23dc7fd42b5c0a1f596c385772a"
jest-config@^17.0.0:
version "17.0.0"
resolved "https://registry.yarnpkg.com/jest-config/-/jest-config-17.0.0.tgz#6474051f00aed3ef050e1342bb753ee672485313"
dependencies:
chalk "^1.1.1"
istanbul "^0.4.5"
jest-environment-jsdom "^16.0.2"
jest-environment-node "^16.0.2"
jest-jasmine2 "^16.0.2"
jest-mock "^16.0.2"
jest-resolve "^16.0.2"
jest-util "^16.0.2"
jest-environment-jsdom "^17.0.0"
jest-environment-node "^17.0.0"
jest-jasmine2 "^17.0.0"
jest-mock "^17.0.0"
jest-resolve "^17.0.0"
jest-util "^17.0.0"
json-stable-stringify "^1.0.0"

jest-diff@^16.0.0:
version "16.0.0"
resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-16.0.0.tgz#4a5d13b1e36c5b8020d5d9e69639e486a675ce14"
jest-diff@^17.0.0:
version "17.0.0"
resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-17.0.0.tgz#d3288d6f28b9db4f78f93e718af5e61cd636bd71"
dependencies:
chalk "^1.1.3"
diff "^3.0.0"
jest-matcher-utils "^16.0.0"
jest-matcher-utils "^17.0.0"
pretty-format "~4.2.1"

jest-environment-jsdom@^16.0.2:
version "16.0.2"
resolved "https://registry.yarnpkg.com/jest-environment-jsdom/-/jest-environment-jsdom-16.0.2.tgz#548d883b68f8ed0bd6466d8703986296724c1ef7"
jest-environment-jsdom@^17.0.0:
version "17.0.0"
resolved "https://registry.yarnpkg.com/jest-environment-jsdom/-/jest-environment-jsdom-17.0.0.tgz#d543000de994857bbe88afa8fd40756363757488"
dependencies:
jest-mock "^16.0.2"
jest-util "^16.0.2"
jsdom "^9.8.0"
jest-mock "^17.0.0"
jest-util "^17.0.0"
jsdom "^9.8.1"

jest-environment-node@^16.0.2:
version "16.0.2"
resolved "https://registry.yarnpkg.com/jest-environment-node/-/jest-environment-node-16.0.2.tgz#eb7b3a4a9c63b728ce023828d4b5661aad8c7a08"
jest-environment-node@^17.0.0:
version "17.0.0"
resolved "https://registry.yarnpkg.com/jest-environment-node/-/jest-environment-node-17.0.0.tgz#cd1f93490a397b632cd251cecf2e560da0a0c468"
dependencies:
jest-mock "^16.0.2"
jest-util "^16.0.2"
jest-mock "^17.0.0"
jest-util "^17.0.0"

jest-file-exists@^15.0.0:
version "15.0.0"
resolved "https://registry.yarnpkg.com/jest-file-exists/-/jest-file-exists-15.0.0.tgz#b7fefdd3f4b227cb686bb156ecc7661ee6935a88"
jest-file-exists@^17.0.0:
version "17.0.0"
resolved "https://registry.yarnpkg.com/jest-file-exists/-/jest-file-exists-17.0.0.tgz#7f63eb73a1c43a13f461be261768b45af2cdd169"

jest-haste-map@^16.0.2:
version "16.0.2"
resolved "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-16.0.2.tgz#4562915b25171ae2d0d75118c992f0e97536a2ed"
jest-haste-map@^17.0.0:
version "17.0.0"
resolved "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-17.0.0.tgz#07ee15f555a1e8106c31c190a6f0e767d39564c2"
dependencies:
fb-watchman "^1.9.0"
graceful-fs "^4.1.6"
multimatch "^2.1.0"
sane "~1.4.1"
worker-farm "^1.3.1"

jest-jasmine2@^16.0.2:
version "16.0.2"
resolved "https://registry.yarnpkg.com/jest-jasmine2/-/jest-jasmine2-16.0.2.tgz#c91ae170d127aae22180dbfe181d77655a5da8c3"
jest-jasmine2@^17.0.0:
version "17.0.0"
resolved "https://registry.yarnpkg.com/jest-jasmine2/-/jest-jasmine2-17.0.0.tgz#811e493b1df968f34b08f9c4573f77b9d9319624"
dependencies:
graceful-fs "^4.1.6"
jasmine-check "^0.1.4"
jest-matchers "^16.0.2"
jest-snapshot "^16.0.2"
jest-util "^16.0.2"
jest-matchers "^17.0.0"
jest-snapshot "^17.0.0"
jest-util "^17.0.0"

jest-matcher-utils@^16.0.0:
version "16.0.0"
resolved "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-16.0.0.tgz#705af3ff85944bec1c25bc813f427aff8642b0cd"
jest-matcher-utils@^17.0.0:
version "17.0.0"
resolved "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-17.0.0.tgz#d7c5609312a555a747d7938b1d560a2e320bc1a6"
dependencies:
chalk "^1.1.3"
pretty-format "~4.2.1"

jest-matchers@^16.0.2:
version "16.0.2"
resolved "https://registry.yarnpkg.com/jest-matchers/-/jest-matchers-16.0.2.tgz#c078c28cfe05b9b1f295f9ab27b5991f1095bbbf"
jest-matchers@^17.0.0:
version "17.0.0"
resolved "https://registry.yarnpkg.com/jest-matchers/-/jest-matchers-17.0.0.tgz#75b8dc7431e9b7afb15e7424b7869ea3d88e6af4"
dependencies:
jest-diff "^16.0.0"
jest-matcher-utils "^16.0.0"
jest-util "^16.0.2"
jest-diff "^17.0.0"
jest-matcher-utils "^17.0.0"
jest-util "^17.0.0"

jest-mock@^16.0.2:
version "16.0.2"
resolved "https://registry.yarnpkg.com/jest-mock/-/jest-mock-16.0.2.tgz#97b533343295d0082e9474a73ac4eb474d1636fe"
jest-mock@^17.0.0:
version "17.0.0"
resolved "https://registry.yarnpkg.com/jest-mock/-/jest-mock-17.0.0.tgz#2475c3fec5d3ac117e2f59d40e1f6311ab9aae40"

jest-resolve-dependencies@^16.0.2:
version "16.0.2"
resolved "https://registry.yarnpkg.com/jest-resolve-dependencies/-/jest-resolve-dependencies-16.0.2.tgz#b204166d50141469d10667dc216239c0be865729"
jest-resolve-dependencies@^17.0.0:
version "17.0.0"
resolved "https://registry.yarnpkg.com/jest-resolve-dependencies/-/jest-resolve-dependencies-17.0.0.tgz#5b9ead58af2c7be7d3a4f49ba28265d4d6db1213"
dependencies:
jest-file-exists "^15.0.0"
jest-resolve "^16.0.2"
jest-file-exists "^17.0.0"
jest-resolve "^17.0.0"

jest-resolve@^16.0.2:
version "16.0.2"
resolved "https://registry.yarnpkg.com/jest-resolve/-/jest-resolve-16.0.2.tgz#46b92b9c2a44aa7ddd9a6b73dc234e9503e8c609"
jest-resolve@^17.0.0:
version "17.0.0"
resolved "https://registry.yarnpkg.com/jest-resolve/-/jest-resolve-17.0.0.tgz#6a2b53ba5080c9d9a96a63bdfc4bd6ac2c3e4628"
dependencies:
browser-resolve "^1.11.2"
jest-file-exists "^15.0.0"
jest-haste-map "^16.0.2"
jest-file-exists "^17.0.0"
jest-haste-map "^17.0.0"
resolve "^1.1.6"

jest-runtime@^16.0.2:
version "16.0.2"
resolved "https://registry.yarnpkg.com/jest-runtime/-/jest-runtime-16.0.2.tgz#a741e8d55a7b5f011bbe17a22c673a83d278a45d"
jest-runtime@^17.0.0:
version "17.0.0"
resolved "https://registry.yarnpkg.com/jest-runtime/-/jest-runtime-17.0.0.tgz#cac76b26ed5bd6f018fa1741087ce1c70632eddd"
dependencies:
babel-core "^6.11.4"
babel-jest "^16.0.0"
babel-core "^6.0.0"
babel-jest "^17.0.0"
babel-plugin-istanbul "^2.0.0"
chalk "^1.1.3"
graceful-fs "^4.1.6"
jest-config "^16.0.2"
jest-file-exists "^15.0.0"
jest-haste-map "^16.0.2"
jest-mock "^16.0.2"
jest-resolve "^16.0.2"
jest-snapshot "^16.0.2"
jest-util "^16.0.2"
jest-config "^17.0.0"
jest-file-exists "^17.0.0"
jest-haste-map "^17.0.0"
jest-mock "^17.0.0"
jest-resolve "^17.0.0"
jest-snapshot "^17.0.0"
jest-util "^17.0.0"
json-stable-stringify "^1.0.0"
multimatch "^2.1.0"
yargs "^5.0.0"
yargs "^6.3.0"

jest-snapshot@^16.0.2:
version "16.0.2"
resolved "https://registry.yarnpkg.com/jest-snapshot/-/jest-snapshot-16.0.2.tgz#f137a4176d661bd4058910850191d1816bebdaae"
jest-snapshot@^17.0.0:
version "17.0.0"
resolved "https://registry.yarnpkg.com/jest-snapshot/-/jest-snapshot-17.0.0.tgz#0601cdc610470ed5e11d9c29f7d753401659d855"
dependencies:
jest-diff "^16.0.0"
jest-file-exists "^15.0.0"
jest-matcher-utils "^16.0.0"
jest-util "^16.0.2"
jest-diff "^17.0.0"
jest-file-exists "^17.0.0"
jest-matcher-utils "^17.0.0"
jest-util "^17.0.0"
natural-compare "^1.4.0"
pretty-format "~4.2.1"

jest-util@^16.0.2:
version "16.0.2"
resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-16.0.2.tgz#db5123358278e7a34a6d9f837409d649a0db5d54"
jest-util@^17.0.0:
version "17.0.0"
resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-17.0.0.tgz#3501b1b2469650b3c9341667b78695ace08e1b68"
dependencies:
chalk "^1.1.1"
diff "^3.0.0"
graceful-fs "^4.1.6"
jest-file-exists "^15.0.0"
jest-mock "^16.0.2"
jest-file-exists "^17.0.0"
jest-mock "^17.0.0"
mkdirp "^0.5.1"

jest@^16.0.2:
version "16.0.2"
resolved "https://registry.yarnpkg.com/jest/-/jest-16.0.2.tgz#4a2f7f3527465168a0bafe0c3d55055188253f3a"
jest@^17.0.0:
version "17.0.0"
resolved "https://registry.yarnpkg.com/jest/-/jest-17.0.0.tgz#ebceb910c4e32cdea2adf44aba304d1ed4ad369e"
dependencies:
jest-cli "^16.0.2"
jest-cli "^17.0.0"

jodid25519@^1.0.0:
version "1.0.2"
Expand All @@ -1710,7 +1711,7 @@ jsbn@~0.1.0:
version "0.1.0"
resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.0.tgz#650987da0dd74f4ebf5a11377a2aa2d273e97dfd"

jsdom@^9.8.0:
jsdom@^9.8.1:
version "9.8.3"
resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-9.8.3.tgz#fde29c109c32a1131e0b6c65914e64198f97c370"
dependencies:
Expand Down Expand Up @@ -1860,7 +1861,7 @@ lodash._getnative@^3.0.0:
version "3.9.1"
resolved "https://registry.yarnpkg.com/lodash._getnative/-/lodash._getnative-3.9.1.tgz#570bc7dede46d61cdcde687d65d3eecbaa3aaff5"

lodash.assign@^4.1.0, lodash.assign@^4.2.0:
lodash.assign@^4.2.0:
version "4.2.0"
resolved "https://registry.yarnpkg.com/lodash.assign/-/lodash.assign-4.2.0.tgz#0d99f3ccd7a6d261d19bdaeb9245005d285808e7"

Expand Down Expand Up @@ -2914,21 +2915,20 @@ y18n@^3.2.1:
version "3.2.1"
resolved "https://registry.yarnpkg.com/y18n/-/y18n-3.2.1.tgz#6d15fba884c08679c0d77e88e7759e811e07fa41"

yargs-parser@^3.2.0:
version "3.2.0"
resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-3.2.0.tgz#5081355d19d9d0c8c5d81ada908cb4e6d186664f"
yargs-parser@^4.0.2:
version "4.1.0"
resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-4.1.0.tgz#313df030f20124124aeae8fbab2da53ec28c56d7"
dependencies:
camelcase "^3.0.0"
lodash.assign "^4.1.0"

yargs@^5.0.0:
version "5.0.0"
resolved "https://registry.yarnpkg.com/yargs/-/yargs-5.0.0.tgz#3355144977d05757dbb86d6e38ec056123b3a66e"
yargs@^6.3.0:
version "6.3.0"
resolved "https://registry.yarnpkg.com/yargs/-/yargs-6.3.0.tgz#19c6dbb768744d571eb6ebae0c174cf2f71b188d"
dependencies:
camelcase "^3.0.0"
cliui "^3.2.0"
decamelize "^1.1.1"
get-caller-file "^1.0.1"
lodash.assign "^4.2.0"
os-locale "^1.4.0"
read-pkg-up "^1.0.1"
require-directory "^2.1.1"
Expand All @@ -2938,7 +2938,7 @@ yargs@^5.0.0:
which-module "^1.0.0"
window-size "^0.2.0"
y18n "^3.2.1"
yargs-parser "^3.2.0"
yargs-parser "^4.0.2"

yargs@~3.10.0:
version "3.10.0"
Expand Down

0 comments on commit b8f7b33

Please sign in to comment.