Skip to content

Commit 1c05920

Browse files
authored
Merge branch 'master' into emit-precompile-errors
2 parents e9131dd + e31c291 commit 1c05920

File tree

2 files changed

+26
-27
lines changed

2 files changed

+26
-27
lines changed

package.json

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,6 @@
5959
"@ember/optional-features": "1.1.0",
6060
"@typed-ember/renovate-config": "1.2.1",
6161
"@types/capture-console": "^1.0.0",
62-
"@types/chai": "4.2.5",
6362
"@types/chai-as-promised": "7.1.2",
6463
"@types/console-ui": "2.2.3",
6564
"@types/core-object": "3.0.1",
@@ -76,8 +75,8 @@
7675
"@types/resolve": "0.0.8",
7776
"@types/semver": "6.2.0",
7877
"@types/tmp": "0.1.0",
79-
"@typescript-eslint/eslint-plugin": "2.9.0",
80-
"@typescript-eslint/parser": "2.9.0",
78+
"@typescript-eslint/eslint-plugin": "2.10.0",
79+
"@typescript-eslint/parser": "2.10.0",
8180
"broccoli-asset-rev": "3.0.0",
8281
"capture-console": "^1.0.1",
8382
"co": "4.6.0",

yarn.lock

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1522,10 +1522,10 @@
15221522
resolved "https://registry.yarnpkg.com/@types/chai/-/chai-4.2.4.tgz#8936cffad3c96ec470a2dc26a38c3ba8b9b6f619"
15231523
integrity sha512-7qvf9F9tMTzo0akeswHPGqgUx/gIaJqrOEET/FCD8CFRkSUHlygQiM5yB6OvjrtdxBVLSyw7COJubsFYs0683g==
15241524

1525-
"@types/chai@4.2.5":
1526-
version "4.2.5"
1527-
resolved "https://registry.yarnpkg.com/@types/chai/-/chai-4.2.5.tgz#f8da153ebbe30babb0adc9a528b9ad32be3175a2"
1528-
integrity sha512-YvbLiIc0DbbhiANrfVObdkLEHJksQZVq0Uvfg550SRAKVYaEJy+V70j65BVe2WNp6E3HtKsUczeijHFCjba3og==
1525+
"@types/chai@4.2.6":
1526+
version "4.2.6"
1527+
resolved "https://registry.yarnpkg.com/@types/chai/-/chai-4.2.6.tgz#a55625d151d9c7c7a0a95920632131d66480bce9"
1528+
integrity sha512-HF8faEUA4JurIm+68VaA2KedtZf5LYdXpQEAbIAN79DwWQbO82BNTksZgCH3UMqbZHXex9C6TrBfg7OUInRISQ==
15291529

15301530
"@types/color-name@^1.1.1":
15311531
version "1.1.1"
@@ -1909,40 +1909,40 @@
19091909
resolved "https://registry.yarnpkg.com/@types/tmp/-/tmp-0.1.0.tgz#19cf73a7bcf641965485119726397a096f0049bd"
19101910
integrity sha512-6IwZ9HzWbCq6XoQWhxLpDjuADodH/MKXRUIDFudvgjcVdjFknvmR+DNsoUeer4XPrEnrZs04Jj+kfV9pFsrhmA==
19111911

1912-
"@typescript-eslint/eslint-plugin@2.9.0":
1913-
version "2.9.0"
1914-
resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-2.9.0.tgz#fa810282c0e45f6c2310b9c0dfcd25bff97ab7e9"
1915-
integrity sha512-98rfOt3NYn5Gr9wekTB8TexxN6oM8ZRvYuphPs1Atfsy419SDLYCaE30aJkRiiTCwGEY98vOhFsEVm7Zs4toQQ==
1912+
"@typescript-eslint/eslint-plugin@2.10.0":
1913+
version "2.10.0"
1914+
resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-2.10.0.tgz#c4cb103275e555e8a7e9b3d14c5951eb6d431e70"
1915+
integrity sha512-rT51fNLW0u3fnDGnAHVC5nu+Das+y2CpW10yqvf6/j5xbuUV3FxA3mBaIbM24CXODXjbgUznNb4Kg9XZOUxKAw==
19161916
dependencies:
1917-
"@typescript-eslint/experimental-utils" "2.9.0"
1917+
"@typescript-eslint/experimental-utils" "2.10.0"
19181918
eslint-utils "^1.4.3"
19191919
functional-red-black-tree "^1.0.1"
19201920
regexpp "^3.0.0"
19211921
tsutils "^3.17.1"
19221922

1923-
"@typescript-eslint/experimental-utils@2.9.0":
1924-
version "2.9.0"
1925-
resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-2.9.0.tgz#bbe99a8d9510240c055fc4b17230dd0192ba3c7f"
1926-
integrity sha512-0lOLFdpdJsCMqMSZT7l7W2ta0+GX8A3iefG3FovJjrX+QR8y6htFlFdU7aOVPL6pDvt6XcsOb8fxk5sq+girTw==
1923+
"@typescript-eslint/experimental-utils@2.10.0":
1924+
version "2.10.0"
1925+
resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-2.10.0.tgz#8db1656cdfd3d9dcbdbf360b8274dea76f0b2c2c"
1926+
integrity sha512-FZhWq6hWWZBP76aZ7bkrfzTMP31CCefVIImrwP3giPLcoXocmLTmr92NLZxuIcTL4GTEOE33jQMWy9PwelL+yQ==
19271927
dependencies:
19281928
"@types/json-schema" "^7.0.3"
1929-
"@typescript-eslint/typescript-estree" "2.9.0"
1929+
"@typescript-eslint/typescript-estree" "2.10.0"
19301930
eslint-scope "^5.0.0"
19311931

1932-
"@typescript-eslint/parser@2.9.0":
1933-
version "2.9.0"
1934-
resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-2.9.0.tgz#2e9cf438de119b143f642a3a406e1e27eb70b7cd"
1935-
integrity sha512-fJ+dNs3CCvEsJK2/Vg5c2ZjuQ860ySOAsodDPwBaVlrGvRN+iCNC8kUfLFL8cT49W4GSiLPa/bHiMjYXA7EhKQ==
1932+
"@typescript-eslint/parser@2.10.0":
1933+
version "2.10.0"
1934+
resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-2.10.0.tgz#24b2e48384ab6d5a6121e4c4faf8892c79657ad3"
1935+
integrity sha512-wQNiBokcP5ZsTuB+i4BlmVWq6o+oAhd8en2eSm/EE9m7BgZUIfEeYFd6z3S+T7bgNuloeiHA1/cevvbBDLr98g==
19361936
dependencies:
19371937
"@types/eslint-visitor-keys" "^1.0.0"
1938-
"@typescript-eslint/experimental-utils" "2.9.0"
1939-
"@typescript-eslint/typescript-estree" "2.9.0"
1938+
"@typescript-eslint/experimental-utils" "2.10.0"
1939+
"@typescript-eslint/typescript-estree" "2.10.0"
19401940
eslint-visitor-keys "^1.1.0"
19411941

1942-
"@typescript-eslint/typescript-estree@2.9.0":
1943-
version "2.9.0"
1944-
resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-2.9.0.tgz#09138daf8f47d0e494ba7db9e77394e928803017"
1945-
integrity sha512-v6btSPXEWCP594eZbM+JCXuFoXWXyF/z8kaSBSdCb83DF+Y7+xItW29SsKtSULgLemqJBT+LpT+0ZqdfH7QVmA==
1942+
"@typescript-eslint/typescript-estree@2.10.0":
1943+
version "2.10.0"
1944+
resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-2.10.0.tgz#89cdabd5e8c774e9d590588cb42fb9afd14dcbd9"
1945+
integrity sha512-oOYnplddQNm/LGVkqbkAwx4TIBuuZ36cAQq9v3nFIU9FmhemHuVzAesMSXNQDdAzCa5bFgCrfD3JWhYVKlRN2g==
19461946
dependencies:
19471947
debug "^4.1.1"
19481948
eslint-visitor-keys "^1.1.0"

0 commit comments

Comments
 (0)