[Console] Fix OSS build by jloleysens · Pull Request #53885 · elastic/kibana

jloleysens · 2020-01-02T11:11:48Z

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

Removed fp-ts and immer from x-pack
Ran yarn add fp-ts@^2.0.5 immer@^1.5.0 in project root ~~(note, yarn.lock did not change so we are using the same version of code for fp-ts and immer)~~ (code is using the same version of immer)
Tested by building with node ./scripts/build.js --oss --docker --skip-archives --skip-os-packages and confirmed that Console works in OSS releases again.

elasticmachine · 2020-01-02T11:11:50Z

Pinging @elastic/es-ui (Team:Elasticsearch UI)

jloleysens · 2020-01-02T11:12:23Z

@elasticmachine merge upstream

jloleysens · 2020-01-02T12:59:35Z

@elasticmachine merge upstream

This reverts commit b876df0.

azasypkin

LGTM with one note (to keep shared dependencies in both root and x-pack package.json).

azasypkin · 2020-01-03T09:15:52Z

package.json

    "fast-deep-equal": "^3.1.1",
    "file-loader": "4.2.0",
    "font-awesome": "4.7.0",
+    "fp-ts": "^2.0.5",


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.

azasypkin · 2020-01-03T17:05:43Z

x-pack/package.json

    "file-type": "^10.9.0",
    "font-awesome": "4.7.0",
    "formsy-react": "^1.1.5",
-    "fp-ts": "^2.0.5",


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?

…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

kibanamachine · 2020-01-06T13:24:54Z

💚 Build Succeeded

continuous-integration/kibana-ci/pull-request
Commit: bb83c23

History

💔 Build #18042 failed 8f8f7a5
💚 Build #17594 succeeded ecfab7e
💔 Build #17552 failed fb063e8
💔 Build #17546 failed 285a862

To update your PR or re-run it, just comment with:
@elasticmachine merge upstream

* 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 <elasticmachine@users.noreply.github.com>

* 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 <elasticmachine@users.noreply.github.com> Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>

…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

Move fp-ts and immer to "." package.json

b876df0

jloleysens added Feature:Console Dev Tools Console Feature v8.0.0 Team:Kibana Management Dev Tools, Index Management, Upgrade Assistant, ILM, Ingest Node Pipelines, and more t// release_note:skip Skip the PR/issue when compiling release notes v7.6.0 labels Jan 2, 2020

jloleysens requested a review from azasypkin January 2, 2020 11:11

Merge branch 'master' into chore/move-console-dependencies

285a862

elasticmachine and others added 3 commits January 2, 2020 04:59

Merge branch 'master' into chore/move-console-dependencies

fb063e8

Revert "Move fp-ts and immer to "." package.json"

55b1539

This reverts commit b876df0.

Second attempt, fp-ts and immer -> root

ecfab7e

azasypkin approved these changes Jan 3, 2020

View reviewed changes

jloleysens added 4 commits January 6, 2020 12:18

fp-ts -> 2.3.1

925b67e

Revert x-pack/package.json

632e27e

Update fp-ts in x-pack/package.json

bb83c23

jloleysens merged commit 6ce2818 into elastic:master Jan 6, 2020

jloleysens deleted the chore/move-console-dependencies branch January 6, 2020 14:21

jloleysens mentioned this pull request Jan 7, 2020

[7.x] [Console] Fix OSS build (#53885) #54094

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[Console] Fix OSS build#53885

[Console] Fix OSS build#53885
jloleysens merged 9 commits intoelastic:masterfrom
jloleysens:chore/move-console-dependencies

jloleysens commented Jan 2, 2020 •

edited

Loading

Uh oh!

elasticmachine commented Jan 2, 2020

Uh oh!

jloleysens commented Jan 2, 2020

Uh oh!

jloleysens commented Jan 2, 2020

Uh oh!

azasypkin left a comment

Uh oh!

azasypkin Jan 3, 2020

Uh oh!

jloleysens Jan 6, 2020

Uh oh!

azasypkin Jan 3, 2020

Uh oh!

jloleysens Jan 6, 2020

Uh oh!

kibanamachine commented Jan 6, 2020

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

Conversation

jloleysens commented Jan 2, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Summary

Additional resources

Steps taken

Uh oh!

elasticmachine commented Jan 2, 2020

Uh oh!

jloleysens commented Jan 2, 2020

Uh oh!

jloleysens commented Jan 2, 2020

Uh oh!

azasypkin left a comment

Choose a reason for hiding this comment

Uh oh!

azasypkin Jan 3, 2020

Choose a reason for hiding this comment

Uh oh!

jloleysens Jan 6, 2020

Choose a reason for hiding this comment

Uh oh!

azasypkin Jan 3, 2020

Choose a reason for hiding this comment

Uh oh!

jloleysens Jan 6, 2020

Choose a reason for hiding this comment

Uh oh!

kibanamachine commented Jan 6, 2020

💚 Build Succeeded

History

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

jloleysens commented Jan 2, 2020 •

edited

Loading