Skip to content

Conversation

@watson
Copy link
Contributor

@watson watson commented Sep 15, 2020

Besides the regular upgrades, this PR also force-upgrades two 1.x versions of node-fetch to v2.6.1:

  • **/cross-fetch/node-fetch - Indirectly used by the graphql-code-generator dependency, which is being removed soon anyway. However, when the cross-fetch dependency upgraded from 1.x to 2.x, they didn't change any of their code, so hopefully this forced upgrade should be ok.
  • **/isomorphic-fetch/node-fetch - Indirectly used by the prop-types dependency. However, the isomorphic-fetch developer recently upgraded to 2.6.1 themselves (no release yet), without changing any other things, so I think the forced upgrade here is ok.

@watson watson added v8.0.0 release_note:skip Skip the PR/issue when compiling release notes v7.10.0 labels Sep 15, 2020
@watson watson self-assigned this Sep 15, 2020
Comment on lines -80 to +103
"**/@types/node": ">=10.17.17 <10.20.0",
"**/@types/react": "^16.9.36",
"**/@types/hapi": "^17.0.18",
"**/@types/angular": "^1.6.56",
"**/@types/hoist-non-react-statics": "^3.3.1",
"**/@types/chai": "^4.2.11",
"**/@types/hapi": "^17.0.18",
"**/@types/hoist-non-react-statics": "^3.3.1",
"**/@types/node": ">=10.17.17 <10.20.0",
"**/@types/react": "^16.9.36",
"**/cross-fetch/node-fetch": "^2.6.1",
"**/cypress/@types/lodash": "^4.14.159",
"**/cypress/lodash": "^4.17.20",
"**/typescript": "4.0.2",
"**/deepmerge": "^4.2.2",
"**/fast-deep-equal": "^3.1.1",
"**/graphql-toolkit/lodash": "^4.17.15",
"**/hoist-non-react-statics": "^3.3.2",
"**/image-diff/gm/debug": "^2.6.9",
"**/isomorphic-fetch/node-fetch": "^2.6.1",
"**/isomorphic-git/**/base64-js": "^1.2.1",
"**/istanbul-instrumenter-loader/schema-utils": "1.0.0",
"**/image-diff/gm/debug": "^2.6.9",
"**/load-grunt-config/lodash": "^4.17.20",
"**/node-jose/node-forge": "^0.10.0",
"**/react-dom": "^16.12.0",
"**/react": "^16.12.0",
"**/react-dom": "^16.12.0",
"**/react-test-renderer": "^16.12.0",
"**/request": "^2.88.2",
"**/deepmerge": "^4.2.2",
"**/fast-deep-equal": "^3.1.1"
"**/typescript": "4.0.2"
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Sorry for the messy diff. I sorted the list alphabetically because it was all over the place. The only change I made was adding these two lines:

+    "**/cross-fetch/node-fetch": "^2.6.1",
+    "**/isomorphic-fetch/node-fetch": "^2.6.1",

@kibanamachine
Copy link
Contributor

💚 Build Succeeded

Build metrics

async chunks size

id value diff baseline
enterpriseSearch 430.1KB +79.0B 430.0KB
maps 3.3MB +17.0B 3.3MB
total +96.0B

page load bundle size

id value diff baseline
upgradeAssistant 64.8KB +79.0B 64.7KB

distributable file count

id value diff baseline
default 45499 -46 45545
oss 27185 -39 27224
total -85

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

@watson watson marked this pull request as ready for review September 15, 2020 10:03
@watson watson requested a review from a team as a code owner September 15, 2020 10:03
@watson watson merged commit 06e8c54 into elastic:master Sep 17, 2020
@watson watson deleted the bump-node-fetch branch September 17, 2020 06:48
watson added a commit to watson/kibana that referenced this pull request Sep 17, 2020
watson added a commit that referenced this pull request Sep 17, 2020
jloleysens added a commit to jloleysens/kibana that referenced this pull request Sep 18, 2020
…rok/new-patterns-component-use-array

* 'master' of github.com:elastic/kibana: (140 commits)
  Add telemetry as an automatic privilege grant (elastic#77390)
  [Security Solutions][Cases] Cases Redesign (elastic#73247)
  Use Search API in TSVB (elastic#76274)
  [Mappings editor] Add support for constant_keyword field type (elastic#76564)
  [ML] Adds ML modules for Metrics UI Integration (elastic#76460)
  [Drilldowns] {{event.points}} in URL drilldown for VALUE_CLICK_TRIGGER (elastic#76771)
  Migrate status & stats APIs to KP + remove legacy status lib (elastic#76054)
  use App updater API instead of deprecated chrome.navLinks.update (elastic#77708)
  [CSM Dashboard] Remove points from line chart (elastic#77617)
  [APM] Trace timeline: Replace multi-fold function icons with new EuiIcon glyphs (elastic#77470)
  [Observability] Overview: Alerts section style improvements (elastic#77670)
  Bump the Node.js version used by Docker in CI (elastic#77714)
  Upgrade all minimist (sub)dependencies to version ^1.2.5 (elastic#60284)
  Remove unneeded forced package resolutions (elastic#77467)
  [ML] Add metrics app to check made for internal custom URLs (elastic#77627)
  Functional tests - add supertest for test_user (elastic#77584)
  [ML] Adding option to create AD jobs without starting the datafeed (elastic#77484)
  Bump node-fetch to 2.6.1 (elastic#77445)
  Bump sharkdown from v0.1.0 to v0.1.1 (elastic#77607)
  [APM]fixing y axis on transaction error rate to 100% (elastic#77609)
  ...

# Conflicts:
#	x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/components/manage_processor_form/manage_processor_form.container.tsx
#	x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/components/manage_processor_form/manage_processor_form.tsx
#	x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/components/processor_form/field_components/drag_and_drop_text_list.scss
#	x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/components/processor_form/field_components/drag_and_drop_text_list.tsx
#	x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/components/processor_form/field_components/text_editor.scss
#	x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/components/processor_form/processors/grok.test.tsx
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

release_note:skip Skip the PR/issue when compiling release notes v7.10.0 v8.0.0

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants