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

Aligns several module versions across the repository #78327

Merged
merged 3 commits into from
Sep 28, 2020

Conversation

tylersmalley
Copy link
Contributor

@tylersmalley tylersmalley commented Sep 23, 2020

We're working to bring Kibana to a single package.json. Details and discussion on that decision is at #76412. This PR aligs a handful of dependencies without any breaking changes across the repository.

Before: #76412 (comment)

After:

@elastic/elasticsearch (7.9.0-rc.2,7.9.0-rc.1)
  - [email protected]
  - packages/kbn-es/[email protected]
  - x-pack/plugins/apm/scripts/[email protected]
chalk (^2.4.2,^4.1.0)
  - package.json@^2.4.2
  - x-pack/package.json@^4.1.0
  - packages/kbn-dev-utils/package.json@^4.1.0
  - packages/kbn-es/package.json@^4.1.0
  - packages/kbn-pm/package.json@^4.1.0
  - packages/kbn-test/package.json@^4.1.0
  - packages/kbn-ui-framework/package.json@^4.1.0
react-router (^5.2.0,^3.2.0)
  - package.json@^5.2.0
  - x-pack/package.json@^5.2.0
  - packages/kbn-ui-framework/package.json@^3.2.0
  - packages/kbn-ui-shared-deps/package.json@^5.2.0
rison-node (1.0.2,0.3.1)
  - [email protected]
  - x-pack/[email protected]
@types/strip-ansi (^3.0.0,^5.2.1)
  - package.json@^3.0.0
  - packages/kbn-pm/package.json@^3.0.0
  - packages/kbn-test/package.json@^5.2.1
react-redux (^7.2.0,^5.1.2)
  - package.json@^7.2.0
  - x-pack/package.json@^7.2.0
  - packages/kbn-ui-framework/package.json@^5.1.2
redux (^4.0.5,3.7.2)
  - package.json@^4.0.5
  - x-pack/package.json@^4.0.5
  - packages/kbn-ui-framework/[email protected]
strip-ansi (^3.0.1,^6.0.0,^4.0.0,^5.2.0)
  - package.json@^3.0.1
  - packages/kbn-dev-utils/package.json@^6.0.0
  - packages/kbn-pm/package.json@^4.0.0
  - packages/kbn-test/package.json@^5.2.0
tape (^4.13.0,^5.0.1)
  - package.json@^4.13.0
  - packages/elastic-safer-lodash-set/package.json@^5.0.1
extract-zip (^1.7.0,^2.0.1)
  - x-pack/package.json@^1.7.0
  - packages/kbn-plugin-helpers/package.json@^2.0.1
graphql (^0.13.2,^14.0.0)
  - x-pack/package.json@^0.13.2
  - packages/kbn-release-notes/package.json@^14.0.0
graphql-tag (^2.9.2,^2.10.3)
  - x-pack/package.json@^2.9.2
  - packages/kbn-release-notes/package.json@^2.10.3
@cypress/webpack-preprocessor (^4.1.0,^5.4.1)
  - x-pack/package.json@^4.1.0
  - x-pack/plugins/apm/e2e/package.json@^5.4.1
cypress (5.0.0,^4.9.0)
  - x-pack/[email protected]
  - x-pack/plugins/apm/e2e/package.json@^4.9.0
ts-loader (^6.0.4,^7.0.5)
  - x-pack/package.json@^6.0.4
  - x-pack/plugins/apm/e2e/package.json@^7.0.5
inquirer (^7.3.3,^1.2.2)
  - packages/kbn-plugin-generator/package.json@^7.3.3
  - packages/kbn-plugin-helpers/package.json@^1.2.2
ora (^1.4.0,^4.0.4)
  - packages/kbn-pm/package.json@^1.4.0
  - x-pack/plugins/apm/e2e/package.json@^4.0.4

@@ -7,23 +7,21 @@
"cypress:open": "cypress open",
"cypress:run": "cypress run --spec **/*.feature"
},
"dependencies": {
"devDependencies": {
Copy link
Contributor Author

Choose a reason for hiding this comment

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

This package is for E2E tests, we should not ship these dependencies.

@tylersmalley tylersmalley force-pushed the align-versions branch 3 times, most recently from f795ff2 to bb2bc5f Compare September 23, 2020 19:45
@@ -7,15 +7,15 @@
"dependencies": {
"@elastic/elasticsearch": "7.9.0-rc.1",
"@kbn/dev-utils": "1.0.0",
"abort-controller": "^2.0.3",
"abort-controller": "^3.0.0",
Copy link
Contributor Author

Choose a reason for hiding this comment

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

3.0.0 just drops IE support

@@ -31,7 +31,7 @@
},
"devDependencies": {
"@babel/core": "^7.11.1",
"@elastic/eui": "0.0.55",
Copy link
Contributor Author

Choose a reason for hiding this comment

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

🤦‍♂️

Copy link
Contributor

Choose a reason for hiding this comment

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

Do the ui-framework docs still work with this change?

Copy link
Contributor Author

@tylersmalley tylersmalley Sep 24, 2020

Choose a reason for hiding this comment

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

That's a good point - We have a discussion to remove ui-framework entirely in #46410 (comment).

I will revert this line, and create another PR to remove all but the assets we're currently relying on for ui-framework so we're not in some half working state.

"apollo-link": "^1.2.3",
"apollo-link-error": "^1.1.7",
"apollo-link-state": "^0.4.1",
"autoprefixer": "^9.7.4",
"axios": "^0.19.0",
Copy link
Contributor Author

@tylersmalley tylersmalley Sep 23, 2020

Choose a reason for hiding this comment

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

Was already in the dependencies list.

@tylersmalley tylersmalley force-pushed the align-versions branch 2 times, most recently from 2aa3ca5 to 73b1bae Compare September 23, 2020 21:19
@elastic elastic deleted a comment from kibanamachine Sep 23, 2020
@tylersmalley
Copy link
Contributor Author

@elasticmachine merge upstream

@tylersmalley tylersmalley added backport:skip This commit does not require backporting Team:Operations Team label for Operations Team v7.10.0 v8.0.0 labels Sep 24, 2020
@tylersmalley tylersmalley marked this pull request as ready for review September 24, 2020 21:29
@tylersmalley tylersmalley requested review from a team as code owners September 24, 2020 21:29
@elasticmachine
Copy link
Contributor

Pinging @elastic/kibana-operations (Team:Operations)

@botelastic botelastic bot added the Team:APM All issues that need APM UI Team support label Sep 24, 2020
@elasticmachine
Copy link
Contributor

Pinging @elastic/apm-ui (Team:apm)

Copy link
Contributor

@smith smith left a comment

Choose a reason for hiding this comment

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

APM changes look good.

Copy link
Contributor

@mshustov mshustov left a comment

Choose a reason for hiding this comment

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

ok for the platform changes

Copy link
Member

@mistic mistic left a comment

Choose a reason for hiding this comment

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

LGTM

@tylersmalley tylersmalley added the release_note:skip Skip the PR/issue when compiling release notes label Sep 28, 2020
@tylersmalley
Copy link
Contributor Author

@elasticmachine merge upstream

@kibanamachine
Copy link
Contributor

💚 Build Succeeded

Metrics [docs]

async chunks size

id value diff baseline
enterpriseSearch 489.3KB +12.0B 489.2KB

page load bundle size

id value diff baseline
upgradeAssistant 64.7KB +6.0B 64.7KB

distributable file count

id value diff baseline
default 45665 -6 45671

History

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

Copy link
Contributor

@cjcenizal cjcenizal left a comment

Choose a reason for hiding this comment

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

LGTM! Tested Painless Lab and Index Management settings editor to verify that both the Ace code editor and Monaco code editor still behave as expected.

@tylersmalley tylersmalley merged commit da134f3 into elastic:master Sep 28, 2020
phillipb added a commit to phillipb/kibana that referenced this pull request Sep 29, 2020
…a into add-anomalies-to-timeline

* 'add-anomalies-to-timeline' of github.com:phillipb/kibana: (89 commits)
  Aligns several module versions across the repository (elastic#78327)
  Empty prompt and loading spinner for service map (elastic#78382)
  Change progress bar to spinner (elastic#78460)
  [QA][Code Coverage] Coverage teams lookup w/o Additional Config (elastic#77111)
  Slim down core bundle (elastic#75912)
  [Alerting] retry internal OCC calls within alertsClient (elastic#77838)
  [kbn/optimizer] only build xpack examples when building xpack plugins (elastic#78656)
  [Ingest Manager] Ingest setup upgrade (elastic#78081)
  [Ingest Manager] Surface saved object client 10,000 limitation to bulk actions UI (elastic#78520)
  fix name without a category or if field end with .text (elastic#78655)
  [Security Solution] [Detections] Log message enhancements (elastic#78429)
  [ML]DF Analytics exploration: default filter of results page by `defaultIsTraining` value in url (elastic#78303)
  [Enterprise Search] Remove all instances of KibanaContext to Kea store (elastic#78513)
  [ML] DF Analytics creation: ensure job did not fail to start before showing results link (elastic#78200)
  fix createAppNavigationHandler to use `navigateToUrl` (elastic#78583)
  Fixing a11y test failure on discover app (elastic#59975) (elastic#77614)
  [Security Solution] Initiate endpoint package upgrade from security app (elastic#77498)
  [kbn/es] use a basic build process (elastic#78090)
  [kbn/optimizer] fix .json extension handling (elastic#78524)
  Fix APM lodash imports (elastic#78438)
  ...
tylersmalley pushed a commit to tylersmalley/kibana that referenced this pull request Sep 29, 2020
Signed-off-by: Tyler Smalley <[email protected]>

Co-authored-by: Elastic Machine <[email protected]>
# Conflicts:
#	package.json
#	packages/kbn-spec-to-console/package.json
#	x-pack/package.json
#	yarn.lock
gmmorris added a commit to gmmorris/kibana that referenced this pull request Sep 29, 2020
* master: (365 commits)
  making expression debug info serializable (elastic#78727)
  fix lodahs imports in app-arch code (elastic#78582)
  Make Field a React.lazy export (elastic#78483)
  [Security Solution] Improves detections tests (elastic#77295)
  [TSVB] Different field format on different series is ignored (elastic#78138)
  RFC: Improve saved object migrations (elastic#66056)
  [Security Solution] Fixes url timeline flaky test (elastic#78556)
  adds retryability feature (elastic#78611)
  Aligns several module versions across the repository (elastic#78327)
  Empty prompt and loading spinner for service map (elastic#78382)
  Change progress bar to spinner (elastic#78460)
  [QA][Code Coverage] Coverage teams lookup w/o Additional Config (elastic#77111)
  Slim down core bundle (elastic#75912)
  [Alerting] retry internal OCC calls within alertsClient (elastic#77838)
  [kbn/optimizer] only build xpack examples when building xpack plugins (elastic#78656)
  [Ingest Manager] Ingest setup upgrade (elastic#78081)
  [Ingest Manager] Surface saved object client 10,000 limitation to bulk actions UI (elastic#78520)
  fix name without a category or if field end with .text (elastic#78655)
  [Security Solution] [Detections] Log message enhancements (elastic#78429)
  [ML]DF Analytics exploration: default filter of results page by `defaultIsTraining` value in url (elastic#78303)
  ...
tylersmalley pushed a commit that referenced this pull request Sep 29, 2020
Signed-off-by: Tyler Smalley <[email protected]>

Co-authored-by: Elastic Machine <[email protected]>
# Conflicts:
#	package.json
#	packages/kbn-spec-to-console/package.json
#	x-pack/package.json
#	yarn.lock
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport:skip This commit does not require backporting release_note:skip Skip the PR/issue when compiling release notes Team:APM All issues that need APM UI Team support Team:Operations Team label for Operations Team v7.10.0 v8.0.0
Projects
None yet
Development

Successfully merging this pull request may close these issues.

9 participants