-
Notifications
You must be signed in to change notification settings - Fork 8.3k
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
[Console] Fix OSS build #53885
[Console] Fix OSS build #53885
Conversation
Pinging @elastic/es-ui (Team:Elasticsearch UI) |
@elasticmachine merge upstream |
@elasticmachine merge upstream |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM with one note (to keep shared dependencies in both root and x-pack package.json
).
package.json
Outdated
@@ -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", |
There was a problem hiding this comment.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Will do!
@@ -231,7 +231,6 @@ | |||
"file-type": "^10.9.0", | |||
"font-awesome": "4.7.0", | |||
"formsy-react": "^1.1.5", | |||
"fp-ts": "^2.0.5", |
There was a problem hiding this comment.
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?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Sure 👍
…nsole-dependencies * 'master' of github.com:elastic/kibana: (33 commits) adds strict types to Alerting Client (elastic#53821) [Dashboard] Empty screen redesign (elastic#53681) Migrate config deprecations and `ShieldUser` functionality to the New Platform (elastic#53768) increase delay to make sure license refetched (elastic#53882) Allow custom NP plugin paths in production (elastic#53562) [Maps] show custom color ramps in legend (elastic#53780) [Lens] Expression type on document can be null (elastic#53883) [SIEM] [Detection engine] Add user permission to detection engine (elastic#53778) Update dependency @elastic/charts to v16.0.2 (elastic#52619) Set consistent EOL symbol in core API docs (elastic#53815) [Logs UI] Refactor query bar state to hooks (elastic#52656) [Maps] pass getFieldFormatter to DynamicTextProperty (elastic#53937) Invalidate alert API Key when generating a new one (elastic#53732) [Logs UI] HTTP API for log entries (elastic#53798) [kbn/pm] add caching to bootstrap (elastic#53622) adds createdAt and updatedAt fields to alerting (elastic#53793) [SR] Enable component integration tests (elastic#53893) Move index patterns: src/legacy/core_plugins/data 👉 src/plugins/data (elastic#53794) moved Task Manager server code under "server" directory (elastic#53777) Rename `/api/security/oidc` to `/api/security/oidc/callback`. (elastic#53886) ... # Conflicts: # yarn.lock
💚 Build SucceededHistory
To update your PR or re-run it, just comment with: |
* master: allows Alerts to recover gracefully from Executor errors (elastic#53688) [Console] Fix OSS build (elastic#53885) migrate xsrf / version-check / custom-headers handlers to NP (elastic#53684) use NP deprecations in uiSettings (elastic#53755) adds strict types to Alerting Client (elastic#53821) [Dashboard] Empty screen redesign (elastic#53681) Migrate config deprecations and `ShieldUser` functionality to the New Platform (elastic#53768)
* Move fp-ts and immer to "." package.json * Revert "Move fp-ts and immer to "." package.json" This reverts commit b876df0. * Second attempt, fp-ts and immer -> root * fp-ts -> 2.3.1 * Revert x-pack/package.json * Update fp-ts in x-pack/package.json Co-authored-by: Elastic Machine <[email protected]>
* Move fp-ts and immer to "." package.json * Revert "Move fp-ts and immer to "." package.json" This reverts commit b876df0. * Second attempt, fp-ts and immer -> root * fp-ts -> 2.3.1 * Revert x-pack/package.json * Update fp-ts in x-pack/package.json Co-authored-by: Elastic Machine <[email protected]> Co-authored-by: Elastic Machine <[email protected]>
…52893 * '7.x' of github.com:elastic/kibana: [Console] Fix OSS build (elastic#53885) (elastic#54094) [Console] Console with better SQL support (elastic#51446) (elastic#54091) Fix suggested value for time_zone in range query (elastic#53841) (elastic#54092) [APM] Show errors on the timeline instead of under the transaction (elastic#53756) (elastic#54109) use NP deprecations in uiSettings (elastic#53755) (elastic#54009) adding message to transaction and span metadata (elastic#54017) (elastic#54090) # Conflicts: # x-pack/legacy/plugins/console_extensions/spec/overrides/sql.query.json
Summary
After merging this PR: #51312 it was discovered that dependencies from x-pack were being used inside of Console (which is an OSS plugin), breaking the OSS release of Console.
Additional resources
#51312 (comment)
Steps taken
fp-ts
andimmer
from x-packyarn add fp-ts@^2.0.5 immer@^1.5.0
in project root(note,(code is using the same version ofyarn.lock
did not change so we are using the same version of code forfp-ts
andimmer
)immer
)node ./scripts/build.js --oss --docker --skip-archives --skip-os-packages
and confirmed that Console works in OSS releases again.