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.

Sign up for GitHub

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

[Console] Fix OSS build #53885

Merged
merged 9 commits into from
Jan 6, 2020
Merged

[Console] Fix OSS build #53885

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
b876df0
Move fp-ts and immer to "." package.json
jloleysens Jan 2, 2020
285a862
Merge branch 'master' into chore/move-console-dependencies
elasticmachine Jan 2, 2020
fb063e8
Merge branch 'master' into chore/move-console-dependencies
elasticmachine Jan 2, 2020
55b1539
Revert "Move fp-ts and immer to "." package.json"
jloleysens Jan 2, 2020
ecfab7e
Second attempt, fp-ts and immer -> root
jloleysens Jan 2, 2020
925b67e
fp-ts -> 2.3.1
jloleysens Jan 6, 2020
632e27e
Revert x-pack/package.json
jloleysens Jan 6, 2020
8f8f7a5
Merge branch 'master' of github.com:elastic/kibana into chore/move-co…
jloleysens Jan 6, 2020
bb83c23
Update fp-ts in x-pack/package.json
jloleysens Jan 6, 2020
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: 2 additions & 0 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,6 +173,7 @@
"fast-deep-equal": "^3.1.1",
"file-loader": "4.2.0",
"font-awesome": "4.7.0",
"fp-ts": "^2.0.5",
Copy link
Member

Choose a reason for hiding this comment

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

optional nit: since it maps directly to 2.3.1 in yarn.lock we can probably bump it here to 2.3.1 as well.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Will do!

"getos": "^3.1.0",
"glob": "^7.1.2",
"glob-all": "^3.1.0",
Expand All @@ -187,6 +188,7 @@
"hoek": "^5.0.4",
"http-proxy-agent": "^2.1.0",
"https-proxy-agent": "^2.2.2",
"immer": "^1.5.0",
"inert": "^5.1.0",
"inline-style": "^2.0.0",
"joi": "^13.5.2",
Expand Down
6 changes: 2 additions & 4 deletions x-pack/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,8 @@
"@storybook/addon-storyshots": "^5.2.6",
"@storybook/react": "^5.2.6",
"@storybook/theming": "^5.2.6",
"@testing-library/react": "^9.3.2",
"@testing-library/jest-dom": "4.2.0",
"@testing-library/react": "^9.3.2",
"@types/angular": "^1.6.56",
"@types/archiver": "^3.0.0",
"@types/base64-js": "^1.2.5",
Expand All @@ -66,8 +66,8 @@
"@types/graphql": "^0.13.2",
"@types/gulp": "^4.0.6",
"@types/hapi__wreck": "^15.0.1",
"@types/hoist-non-react-statics": "^3.3.0",
"@types/history": "^4.7.3",
"@types/hoist-non-react-statics": "^3.3.0",
"@types/jest": "24.0.19",
"@types/joi": "^13.4.2",
"@types/js-yaml": "^3.11.1",
Expand Down Expand Up @@ -231,7 +231,6 @@
"file-type": "^10.9.0",
"font-awesome": "4.7.0",
"formsy-react": "^1.1.5",
"fp-ts": "^2.0.5",
Copy link
Member

Choose a reason for hiding this comment

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

note: I've just been told that the best practice in Kibana is to explicitly list dependencies in both root package.json and xpack/package.json if it's used in both OSS and in XPack plugins even though it's not strictly necessary. Would you mind still keeping these two here as well?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Sure 👍

"geojson-rewind": "^0.3.1",
"get-port": "4.2.0",
"getos": "^3.1.0",
Expand All @@ -249,7 +248,6 @@
"i18n-iso-countries": "^4.3.1",
"icalendar": "0.7.1",
"idx": "^2.5.6",
"immer": "^1.5.0",
"inline-style": "^2.0.0",
"intl": "^1.2.5",
"io-ts": "^2.0.1",
Expand Down
6 changes: 3 additions & 3 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13184,9 +13184,9 @@ fp-ts@^1.14.2:
integrity sha512-r4gHfAWaRrYPsmdzRl1U9CkpbdOi8fPg5F5KiazAadENz5DKdWEaCDPl2Tf92fvkZGD/ekZ3EHu3gtXIVcsXtA==

fp-ts@^2.0.5:
version "2.0.5"
resolved "https://registry.yarnpkg.com/fp-ts/-/fp-ts-2.0.5.tgz#9560d8a6a4f53cbda9f9b31ed8d1458e41939e07"
integrity sha512-opI5r+rVlpZE7Rhk0YtqsrmxGkbIw0dRNqGca8FEAMMnjomXotG+R9QkLQg20onx7R8qhepAn4CCOP8usma/Xw==
version "2.3.1"
resolved "https://registry.yarnpkg.com/fp-ts/-/fp-ts-2.3.1.tgz#8068bfcca118227932941101e062134d7ecd9119"
integrity sha512-KevPBnYt0aaJiuUzmU9YIxjrhC9AgJ8CLtLlXmwArovlNTeYM5NtEoKd86B0wHd7FIbzeE8sNXzCoYIOr7e6Iw==

fragment-cache@^0.2.1:
version "0.2.1"
Expand Down