Skip to content

Commit bb94f4a

Browse files
zfy0701mw-ding
authored andcommitted
[Code]: fix duplicate import agains kbn/test/types package, update typescript language server version (#32439)
1 parent e8ec86d commit bb94f4a

File tree

2 files changed

+9
-25
lines changed

2 files changed

+9
-25
lines changed

x-pack/package.json

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@
4545
"@types/d3-time": "^1.0.7",
4646
"@types/d3-time-format": "^2.1.0",
4747
"@types/elasticsearch": "^5.0.30",
48-
"@types/expect.js": "^0.3.29",
4948
"@types/file-type": "^5.2.1",
5049
"@types/get-port": "^3.2.0 ",
5150
"@types/git-url-parse": "^9.0.0",
@@ -61,7 +60,7 @@
6160
"@types/mkdirp": "^0.5.2",
6261
"@types/mocha": "^5.2.6",
6362
"@types/nock": "^9.3.0",
64-
"@types/node": "^10.12.12",
63+
"@types/node": "^10.12.27",
6564
"@types/node-fetch": "^2.1.4",
6665
"@types/nodegit": "^0.22.1",
6766
"@types/papaparse": "^4.5.5",
@@ -156,7 +155,7 @@
156155
"dependencies": {
157156
"@elastic/datemath": "5.0.2",
158157
"@elastic/eui": "7.1.0",
159-
"@elastic/javascript-typescript-langserver": "^0.1.12",
158+
"@elastic/javascript-typescript-langserver": "^0.1.13",
160159
"@elastic/lsp-extension": "^0.1.1",
161160
"@elastic/node-crypto": "0.1.2",
162161
"@elastic/numeral": "2.3.2",

yarn.lock

Lines changed: 7 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -861,15 +861,15 @@
861861
oppsy "2.x.x"
862862
pumpify "1.3.x"
863863

864-
"@elastic/javascript-typescript-langserver@^0.1.12":
865-
version "0.1.12"
866-
resolved "https://registry.yarnpkg.com/@elastic/javascript-typescript-langserver/-/javascript-typescript-langserver-0.1.12.tgz#eaf2d1b80a507d02cd901d7c7a2acdd493e32e66"
867-
integrity sha512-xU0WeJMbMUMXtJwRrPOlDE2IvzVdtxXhGov4vQ22w5y8sMKtapxXHbpdc3KhudRo8YcMrmtN92b/imcuJ8Q7oQ==
864+
"@elastic/javascript-typescript-langserver@^0.1.13":
865+
version "0.1.13"
866+
resolved "https://registry.yarnpkg.com/@elastic/javascript-typescript-langserver/-/javascript-typescript-langserver-0.1.13.tgz#817add6bf8b92865bfb3024cd094f5f63863dcb3"
867+
integrity sha512-TdAIZ/6d9QxNkkb+/iXTX1RZRLfFIaum0HxJBggJSBCqbhsKBBTpIdRjA2Kdf1sYn8bNNkHoRu/BSqS4ZWebxw==
868868
dependencies:
869869
"@elastic/lsp-extension" "^0.1.1"
870870
javascript-typescript-langserver "^2.11.2"
871871
rxjs "^5.5.0"
872-
typescript "~3.1.1"
872+
typescript "~3.3.3333"
873873

874874
"@elastic/lsp-extension@^0.1.1":
875875
version "0.1.1"
@@ -1835,11 +1835,6 @@
18351835
dependencies:
18361836
"@types/node" "*"
18371837

1838-
"@types/expect.js@^0.3.29":
1839-
version "0.3.29"
1840-
resolved "https://registry.yarnpkg.com/@types/expect.js/-/expect.js-0.3.29.tgz#28dd359155b84b8ecb094afc3f4b74c3222dca3b"
1841-
integrity sha1-KN01kVW4S47LCUr8P0t0wyItyjs=
1842-
18431838
18441839
version "7.2.1"
18451840
resolved "https://registry.yarnpkg.com/@types/fetch-mock/-/fetch-mock-7.2.1.tgz#5630999aa75532e00af42a54cbe05e1651f4a080"
@@ -2143,7 +2138,7 @@
21432138
dependencies:
21442139
"@types/node" "*"
21452140

2146-
"@types/node@*", "@types/[email protected]", "@types/node@>=6.0.0", "@types/node@^10.12.12", "@types/node@^10.12.27":
2141+
"@types/node@*", "@types/[email protected]", "@types/node@>=6.0.0", "@types/node@^10.12.27":
21472142
version "10.12.27"
21482143
resolved "https://registry.yarnpkg.com/@types/node/-/node-10.12.27.tgz#eb3843f15d0ba0986cc7e4d734d2ee8b50709ef8"
21492144
integrity sha512-e9wgeY6gaY21on3ve0xAjgBVjGDWq/xUteK0ujsE53bUoxycMkqfnkUgMt6ffZtykZ5X12Mg3T7Pw4TRCObDKg==
@@ -24124,21 +24119,11 @@ typescript-fsa@^2.0.0, typescript-fsa@^2.5.0:
2412424119
resolved "https://registry.yarnpkg.com/typescript-fsa/-/typescript-fsa-2.5.0.tgz#1baec01b5e8f5f34c322679d1327016e9e294faf"
2412524120
integrity sha1-G67AG16PXzTDImedEycBbp4pT68=
2412624121

24127-
typescript@^3.3.3333:
24122+
typescript@^3.3.3333, typescript@~3.0.3, typescript@~3.3.3333:
2412824123
version "3.3.3333"
2412924124
resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.3.3333.tgz#171b2c5af66c59e9431199117a3bcadc66fdcfd6"
2413024125
integrity sha512-JjSKsAfuHBE/fB2oZ8NxtRTk5iGcg6hkYXMnZ3Wc+b2RSqejEqTaem11mHASMnFilHrax3sLK0GDzcJrekZYLw==
2413124126

24132-
typescript@~3.0.3:
24133-
version "3.0.3"
24134-
resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.0.3.tgz#4853b3e275ecdaa27f78fda46dc273a7eb7fc1c8"
24135-
integrity sha512-kk80vLW9iGtjMnIv11qyxLqZm20UklzuR2tL0QAnDIygIUIemcZMxlMWudl9OOt76H3ntVzcTiddQ1/pAAJMYg==
24136-
24137-
typescript@~3.1.1:
24138-
version "3.1.6"
24139-
resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.1.6.tgz#b6543a83cfc8c2befb3f4c8fba6896f5b0c9be68"
24140-
integrity sha512-tDMYfVtvpb96msS1lDX9MEdHrW4yOuZ4Kdc4Him9oU796XldPYF/t2+uKoX0BBa0hXXwDlqYQbXY5Rzjzc5hBA==
24141-
2414224127
ua-parser-js@^0.7.18:
2414324128
version "0.7.18"
2414424129
resolved "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-0.7.18.tgz#a7bfd92f56edfb117083b69e31d2aa8882d4b1ed"

0 commit comments

Comments
 (0)