Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[New Platform] Replace Express with Hapi 17. #18562

Merged
merged 7 commits into from
May 28, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion example_plugins/bar/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,6 @@
"types": "./target/tsc-types/index.d.ts",
"devDependencies": {
"@kbn/types": "link:../../packages/kbn-types",
"typescript": "^2.7.1"
"typescript": "^2.8.3"
}
}
6 changes: 3 additions & 3 deletions example_plugins/bar/yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@
version "0.0.0"
uid ""

typescript@^2.7.1:
version "2.7.1"
resolved "https://registry.yarnpkg.com/typescript/-/typescript-2.7.1.tgz#bb3682c2c791ac90e7c6210b26478a8da085c359"
typescript@^2.8.3:
version "2.8.3"
resolved "https://registry.yarnpkg.com/typescript/-/typescript-2.8.3.tgz#5d817f9b6f31bb871835f4edf0089f21abe6c170"
2 changes: 1 addition & 1 deletion example_plugins/baz/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,6 @@
},
"devDependencies": {
"@kbn/types": "link:../../packages/kbn-types",
"typescript": "^2.7.1"
"typescript": "^2.8.3"
}
}
6 changes: 3 additions & 3 deletions example_plugins/baz/yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@
version "0.0.0"
uid ""

typescript@^2.7.1:
version "2.7.1"
resolved "https://registry.yarnpkg.com/typescript/-/typescript-2.7.1.tgz#bb3682c2c791ac90e7c6210b26478a8da085c359"
typescript@^2.8.3:
version "2.8.3"
resolved "https://registry.yarnpkg.com/typescript/-/typescript-2.8.3.tgz#5d817f9b6f31bb871835f4edf0089f21abe6c170"
2 changes: 1 addition & 1 deletion example_plugins/foo/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,6 @@
"devDependencies": {
"@kbn/types": "link:../../packages/kbn-types",
"example-plugin-bar": "link:../bar",
"typescript": "^2.7.1"
"typescript": "^2.8.3"
}
}
6 changes: 3 additions & 3 deletions example_plugins/foo/yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,6 @@
version "0.0.0"
uid ""

typescript@^2.7.1:
version "2.7.1"
resolved "https://registry.yarnpkg.com/typescript/-/typescript-2.7.1.tgz#bb3682c2c791ac90e7c6210b26478a8da085c359"
typescript@^2.8.3:
version "2.8.3"
resolved "https://registry.yarnpkg.com/typescript/-/typescript-2.8.3.tgz#5d817f9b6f31bb871835f4edf0089f21abe6c170"
12 changes: 4 additions & 8 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,6 @@
"babel-polyfill": "6.20.0",
"babel-register": "6.18.0",
"bluebird": "2.9.34",
"body-parser": "1.17.2",
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

note: removing all ExpressJS specific packages, we can easily return them back when needed.

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you explain this more? If we are still using ExpressJS, why would we remove these?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Once this PR lands we'll be using only Hapi in new platform, hence we don't need any ExpressJS packages.

"boom": "5.2.0",
"brace": "0.11.1",
"bunyan": "1.7.1",
Expand All @@ -123,7 +122,6 @@
"expiry-js": "0.1.7",
"exports-loader": "0.6.4",
"expose-loader": "0.7.3",
"express": "4.15.4",
"extract-text-webpack-plugin": "3.0.1",
"fetch-mock": "^5.13.1",
"file-loader": "1.1.4",
Expand Down Expand Up @@ -232,16 +230,14 @@
"@kbn/eslint-plugin-license-header": "link:packages/kbn-eslint-plugin-license-header",
"@kbn/plugin-generator": "link:packages/kbn-plugin-generator",
"@kbn/test": "link:packages/kbn-test",
"@types/body-parser": "1.16.4",
"@types/chance": "0.7.34",
"@types/elasticsearch": "5.0.14",
"@types/express": "4.0.36",
"@types/jest": "^22.1.3",
"@types/jest": "^22.2.3",
"@types/js-yaml": "3.9.0",
"@types/lodash": "3.10.1",
"@types/node": "^8.9.4",
"@types/node": "^8.10.9",
"@types/sinon": "1.16.36",
"@types/supertest": "2.0.2",
"@types/supertest": "^2.0.4",
"@types/type-detect": "^4.0.1",
"@types/yargs": "6.6.0",
"angular-mocks": "1.4.7",
Expand Down Expand Up @@ -319,7 +315,7 @@
"supertest-as-promised": "4.0.2",
"tree-kill": "^1.1.0",
"ts-jest": "^22.4.3",
"typescript": "^2.8.1",
"typescript": "^2.8.3",
"vinyl-fs": "^3.0.2",
"xml2js": "^0.4.19",
"xmlbuilder": "9.0.4"
Expand Down
2 changes: 1 addition & 1 deletion packages/kbn-observable/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,6 @@
"rxjs": "5.4.3"
},
"devDependencies": {
"typescript": "^2.7.1"
"typescript": "^2.8.3"
}
}
6 changes: 3 additions & 3 deletions packages/kbn-observable/yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,6 @@ symbol-observable@^1.0.1:
version "1.1.0"
resolved "https://registry.yarnpkg.com/symbol-observable/-/symbol-observable-1.1.0.tgz#5c68fd8d54115d9dfb72a84720549222e8db9b32"

typescript@^2.7.1:
version "2.7.1"
resolved "https://registry.yarnpkg.com/typescript/-/typescript-2.7.1.tgz#bb3682c2c791ac90e7c6210b26478a8da085c359"
typescript@^2.8.3:
version "2.8.3"
resolved "https://registry.yarnpkg.com/typescript/-/typescript-2.8.3.tgz#5d817f9b6f31bb871835f4edf0089f21abe6c170"
2 changes: 1 addition & 1 deletion packages/kbn-types/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,6 @@
},
"devDependencies": {
"@kbn/platform": "link:../../platform",
"typescript": "^2.7.1"
"typescript": "^2.8.3"
}
}
239 changes: 236 additions & 3 deletions packages/kbn-types/yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,218 @@
version "0.0.0"
uid ""

[email protected]:
version "3.0.2"
resolved "https://registry.yarnpkg.com/accept/-/accept-3.0.2.tgz#83e41cec7e1149f3fd474880423873db6c6cc9ac"
dependencies:
boom "7.x.x"
hoek "5.x.x"

[email protected]:
version "3.0.0"
resolved "https://registry.yarnpkg.com/ammo/-/ammo-3.0.0.tgz#30f322f70a0904eaee1788f4d26c5be1d72da181"
dependencies:
boom "6.x.x"
hoek "5.x.x"

[email protected]:
version "4.0.0"
resolved "https://registry.yarnpkg.com/b64/-/b64-4.0.0.tgz#c37f587f0a383c7019e821120e8c3f58f0d22772"

[email protected]:
version "2.0.1"
resolved "https://registry.yarnpkg.com/big-time/-/big-time-2.0.1.tgz#68c7df8dc30f97e953f25a67a76ac9713c16c9de"

[email protected]:
version "6.0.0"
resolved "https://registry.yarnpkg.com/boom/-/boom-6.0.0.tgz#9b36c52a12afab3f0e55536131b7fd5021aad0cc"
dependencies:
hoek "5.x.x"

[email protected]:
version "7.2.0"
resolved "https://registry.yarnpkg.com/boom/-/boom-7.2.0.tgz#2bff24a55565767fde869ec808317eb10c48e966"
dependencies:
hoek "5.x.x"

[email protected]:
version "1.2.0"
resolved "https://registry.yarnpkg.com/bounce/-/bounce-1.2.0.tgz#e3bac68c73fd256e38096551efc09f504873c8c8"
dependencies:
boom "7.x.x"
hoek "5.x.x"

[email protected]:
version "5.0.1"
resolved "https://registry.yarnpkg.com/call/-/call-5.0.1.tgz#ac1b5c106d9edc2a17af2a4a4f74dd4f0c06e910"
dependencies:
boom "7.x.x"
hoek "5.x.x"

[email protected]:
version "3.1.2"
resolved "https://registry.yarnpkg.com/catbox-memory/-/catbox-memory-3.1.2.tgz#4aeec1bc994419c0f7e60087f172aaedd9b4911c"
dependencies:
big-time "2.x.x"
boom "7.x.x"
hoek "5.x.x"

[email protected]:
version "10.0.2"
resolved "https://registry.yarnpkg.com/catbox/-/catbox-10.0.2.tgz#e6ac1f35102d1a9bd07915b82e508d12b50a8bfa"
dependencies:
boom "7.x.x"
bounce "1.x.x"
hoek "5.x.x"
joi "13.x.x"

[email protected]:
version "4.0.5"
resolved "https://registry.yarnpkg.com/content/-/content-4.0.5.tgz#bc547deabc889ab69bce17faf3585c29f4c41bf2"
dependencies:
boom "7.x.x"

[email protected]:
version "4.1.1"
resolved "https://registry.yarnpkg.com/cryptiles/-/cryptiles-4.1.1.tgz#169256b9df9fe3c73f8085c99e30b32247d4ab46"
dependencies:
boom "7.x.x"

hapi@^17.4.0:
version "17.4.0"
resolved "https://registry.yarnpkg.com/hapi/-/hapi-17.4.0.tgz#c56c0ec3b8d678cc941bdb943bcbddc4107e838b"
dependencies:
accept "3.x.x"
ammo "3.x.x"
boom "7.x.x"
bounce "1.x.x"
call "5.x.x"
catbox "10.x.x"
catbox-memory "3.x.x"
heavy "6.x.x"
hoek "5.x.x"
joi "13.x.x"
mimos "4.x.x"
podium "3.x.x"
shot "4.x.x"
statehood "6.x.x"
subtext "6.x.x"
teamwork "3.x.x"
topo "3.x.x"

[email protected]:
version "6.1.0"
resolved "https://registry.yarnpkg.com/heavy/-/heavy-6.1.0.tgz#1bbfa43dc61dd4b543ede3ff87db8306b7967274"
dependencies:
boom "7.x.x"
hoek "5.x.x"
joi "13.x.x"

[email protected]:
version "5.0.3"
resolved "https://registry.yarnpkg.com/hoek/-/hoek-5.0.3.tgz#b71d40d943d0a95da01956b547f83c4a5b4a34ac"

[email protected]:
version "5.0.4"
resolved "https://registry.yarnpkg.com/iron/-/iron-5.0.4.tgz#003ed822f656f07c2b62762815f5de3947326867"
dependencies:
boom "7.x.x"
cryptiles "4.x.x"
hoek "5.x.x"

[email protected]:
version "3.1.2"
resolved "https://registry.yarnpkg.com/isemail/-/isemail-3.1.2.tgz#937cf919002077999a73ea8b1951d590e84e01dd"
dependencies:
punycode "2.x.x"

[email protected]:
version "13.2.0"
resolved "https://registry.yarnpkg.com/joi/-/joi-13.2.0.tgz#72307f1765bb40b068361f9368a4ba1092b8478e"
dependencies:
hoek "5.x.x"
isemail "3.x.x"
topo "3.x.x"

[email protected]:
version "1.33.0"
resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.33.0.tgz#a3492050a5cb9b63450541e39d9788d2272783db"

[email protected]:
version "4.0.0"
resolved "https://registry.yarnpkg.com/mimos/-/mimos-4.0.0.tgz#76e3d27128431cb6482fd15b20475719ad626a5a"
dependencies:
hoek "5.x.x"
mime-db "1.x.x"

[email protected]:
version "3.0.1"
resolved "https://registry.yarnpkg.com/nigel/-/nigel-3.0.1.tgz#48a08859d65177312f1c25af7252c1e07bb07c2a"
dependencies:
hoek "5.x.x"
vise "3.x.x"

[email protected]:
version "4.0.2"
resolved "https://registry.yarnpkg.com/pez/-/pez-4.0.2.tgz#0a7c81b64968e90b0e9562b398f390939e9c4b53"
dependencies:
b64 "4.x.x"
boom "7.x.x"
content "4.x.x"
hoek "5.x.x"
nigel "3.x.x"

[email protected]:
version "3.1.2"
resolved "https://registry.yarnpkg.com/podium/-/podium-3.1.2.tgz#b701429739cf6bdde6b3015ae6b48d400817ce9e"
dependencies:
hoek "5.x.x"
joi "13.x.x"

[email protected]:
version "2.1.0"
resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.0.tgz#5f863edc89b96db09074bad7947bf09056ca4e7d"

[email protected]:
version "5.4.3"
resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-5.4.3.tgz#0758cddee6033d68e0fd53676f0f3596ce3d483f"
dependencies:
symbol-observable "^1.0.1"

rxjs@^6.1.0:
version "6.1.0"
resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.1.0.tgz#833447de4e4f6427b9cec3e5eb9f56415cd28315"
dependencies:
tslib "^1.9.0"

[email protected]:
version "4.0.5"
resolved "https://registry.yarnpkg.com/shot/-/shot-4.0.5.tgz#c7e7455d11d60f6b6cd3c43e15a3b431c17e5566"
dependencies:
hoek "5.x.x"
joi "13.x.x"

[email protected]:
version "6.0.6"
resolved "https://registry.yarnpkg.com/statehood/-/statehood-6.0.6.tgz#0dbd7c50774d3f61a24e42b0673093bbc81fa5f0"
dependencies:
boom "7.x.x"
bounce "1.x.x"
cryptiles "4.x.x"
hoek "5.x.x"
iron "5.x.x"
joi "13.x.x"

[email protected]:
version "6.0.7"
resolved "https://registry.yarnpkg.com/subtext/-/subtext-6.0.7.tgz#8e40a67901a734d598142665c90e398369b885f9"
dependencies:
boom "7.x.x"
content "4.x.x"
hoek "5.x.x"
pez "4.x.x"
wreck "14.x.x"

[email protected]:
version "1.0.4"
resolved "https://registry.yarnpkg.com/symbol-observable/-/symbol-observable-1.0.4.tgz#29bf615d4aa7121bdd898b22d4b3f9bc4e2aa03d"
Expand All @@ -32,10 +238,37 @@ symbol-observable@^1.0.1:
version "1.2.0"
resolved "https://registry.yarnpkg.com/symbol-observable/-/symbol-observable-1.2.0.tgz#c22688aed4eab3cdc2dfeacbb561660560a00804"

[email protected]:
version "3.0.1"
resolved "https://registry.yarnpkg.com/teamwork/-/teamwork-3.0.1.tgz#ff38c7161f41f8070b7813716eb6154036ece196"

[email protected]:
version "3.0.0"
resolved "https://registry.yarnpkg.com/topo/-/topo-3.0.0.tgz#37e48c330efeac784538e0acd3e62ca5e231fe7a"
dependencies:
hoek "5.x.x"

tslib@^1.9.0:
version "1.9.0"
resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.9.0.tgz#e37a86fda8cbbaf23a057f473c9f4dc64e5fc2e8"

type-detect@^4.0.8:
version "4.0.8"
resolved "https://registry.yarnpkg.com/type-detect/-/type-detect-4.0.8.tgz#7646fb5f18871cfbb7749e69bd39a6388eb7450c"

typescript@^2.7.1:
version "2.7.1"
resolved "https://registry.yarnpkg.com/typescript/-/typescript-2.7.1.tgz#bb3682c2c791ac90e7c6210b26478a8da085c359"
typescript@^2.8.3:
version "2.8.3"
resolved "https://registry.yarnpkg.com/typescript/-/typescript-2.8.3.tgz#5d817f9b6f31bb871835f4edf0089f21abe6c170"

[email protected]:
version "3.0.0"
resolved "https://registry.yarnpkg.com/vise/-/vise-3.0.0.tgz#76ad14ab31669c50fbb0817bc0e72fedcbb3bf4c"
dependencies:
hoek "5.x.x"

[email protected]:
version "14.0.2"
resolved "https://registry.yarnpkg.com/wreck/-/wreck-14.0.2.tgz#89c17a9061c745ed1c3aebcb66ea181dbaab454c"
dependencies:
boom "7.x.x"
hoek "5.x.x"
Loading