Skip to content

Commit

Permalink
[7.17] Upgrade json5 dependency (2.2.1 → 2.2.3) (#148326) (#148837)
Browse files Browse the repository at this point in the history 
# Backport

This will backport the following commits from `main` to `7.17`:
- [Upgrade json5 dependency (2.2.1 → 2.2.3)
(#148326)](#148326)

<!--- Backport version: 8.9.7 -->

### Questions ?
Please refer to the [Backport tool
documentation](https://github.com/sqren/backport)

<!--BACKPORT [{"author":{"name":"Jeramy
Soucy","email":"[email protected]"},"sourceCommit":{"committedDate":"2023-01-05T18:29:39Z","message":"Upgrade
json5 dependency (2.2.1 → 2.2.3) (#148326)\n\nUpgrade json5 production
dependency (2.2.1 → 2.2.3).\r\nUpgrade json5 dev dependency (1.0.1 →
1.0.2) \r\nAlso upgrades production dependency types/json5 to
2.2.0.\r\n\r\nChange log
(json5):\r\nhttps://github.com/json5/json5/blob/main/CHANGELOG.md#v223-code-diff\r\n\r\ncc
https://github.com/orgs/elastic/teams/kibana-security\r\n\r\nCo-authored-by:
Thomas Watson
<[email protected]>","sha":"1037f3669edb930c4ca27a1891adc2a36bf265c7","branchLabelMapping":{"^v8.7.0$":"main","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["Team:Security","release_note:skip","backport:all-open","v8.7.0","v8.6.1","v8.5.4"],"number":148326,"url":"https://github.com/elastic/kibana/pull/148326","mergeCommit":{"message":"Upgrade
json5 dependency (2.2.1 → 2.2.3) (#148326)\n\nUpgrade json5 production
dependency (2.2.1 → 2.2.3).\r\nUpgrade json5 dev dependency (1.0.1 →
1.0.2) \r\nAlso upgrades production dependency types/json5 to
2.2.0.\r\n\r\nChange log
(json5):\r\nhttps://github.com/json5/json5/blob/main/CHANGELOG.md#v223-code-diff\r\n\r\ncc
https://github.com/orgs/elastic/teams/kibana-security\r\n\r\nCo-authored-by:
Thomas Watson
<[email protected]>","sha":"1037f3669edb930c4ca27a1891adc2a36bf265c7"}},"sourceBranch":"main","suggestedTargetBranches":[],"targetPullRequestStates":[{"branch":"main","label":"v8.7.0","labelRegex":"^v8.7.0$","isSourceBranch":true,"state":"MERGED","url":"https://github.com/elastic/kibana/pull/148326","number":148326,"mergeCommit":{"message":"Upgrade
json5 dependency (2.2.1 → 2.2.3) (#148326)\n\nUpgrade json5 production
dependency (2.2.1 → 2.2.3).\r\nUpgrade json5 dev dependency (1.0.1 →
1.0.2) \r\nAlso upgrades production dependency types/json5 to
2.2.0.\r\n\r\nChange log
(json5):\r\nhttps://github.com/json5/json5/blob/main/CHANGELOG.md#v223-code-diff\r\n\r\ncc
https://github.com/orgs/elastic/teams/kibana-security\r\n\r\nCo-authored-by:
Thomas Watson
<[email protected]>","sha":"1037f3669edb930c4ca27a1891adc2a36bf265c7"}},{"branch":"8.6","label":"v8.6.1","labelRegex":"^v(\\d+).(\\d+).\\d+$","isSourceBranch":false,"url":"https://github.com/elastic/kibana/pull/148476","number":148476,"state":"MERGED","mergeCommit":{"sha":"5213e30e4991ac56da8fedbff6009e8021f97435","message":"[8.6]
Upgrade json5 dependency (2.2.1 → 2.2.3) (#148326) (#148476)\n\n#
Backport\n\nThis will backport the following commits from `main` to
`8.6`:\n- [Upgrade json5 dependency (2.2.1 →
2.2.3)\n(#148326)](https://github.com/elastic/kibana/pull/148326)\n\n<!---
Backport version: 8.9.7 -->\n\n### Questions ?\nPlease refer to the
[Backport
tool\ndocumentation](https://github.com/sqren/backport)\n\n<!--BACKPORT
[{\"author\":{\"name\":\"Jeramy\nSoucy\",\"email\":\"[email protected]\"},\"sourceCommit\":{\"committedDate\":\"2023-01-05T18:29:39Z\",\"message\":\"Upgrade\njson5
dependency (2.2.1 → 2.2.3) (#148326)\\n\\nUpgrade json5
production\ndependency (2.2.1 → 2.2.3).\\r\\nUpgrade json5 dev
dependency (1.0.1 →\n1.0.2) \\r\\nAlso upgrades production dependency
types/json5 to\n2.2.0.\\r\\n\\r\\nChange
log\n(json5):\\r\\nhttps://github.com/json5/json5/blob/main/CHANGELOG.md#v223-code-diff\\r\\n\\r\\ncc\nhttps://github.com/orgs/elastic/teams/kibana-security\\r\\n\\r\\nCo-authored-by:\nThomas
Watson\n<[email protected]>\",\"sha\":\"1037f3669edb930c4ca27a1891adc2a36bf265c7\",\"branchLabelMapping\":{\"^v8.7.0$\":\"main\",\"^v(\\\\d+).(\\\\d+).\\\\d+$\":\"$1.$2\"}},\"sourcePullRequest\":{\"labels\":[\"Team:Security\",\"release_note:skip\",\"backport:all-open\",\"v8.7.0\"],\"number\":148326,\"url\":\"https://github.com/elastic/kibana/pull/148326\",\"mergeCommit\":{\"message\":\"Upgrade\njson5
dependency (2.2.1 → 2.2.3) (#148326)\\n\\nUpgrade json5
production\ndependency (2.2.1 → 2.2.3).\\r\\nUpgrade json5 dev
dependency (1.0.1 →\n1.0.2) \\r\\nAlso upgrades production dependency
types/json5 to\n2.2.0.\\r\\n\\r\\nChange
log\n(json5):\\r\\nhttps://github.com/json5/json5/blob/main/CHANGELOG.md#v223-code-diff\\r\\n\\r\\ncc\nhttps://github.com/orgs/elastic/teams/kibana-security\\r\\n\\r\\nCo-authored-by:\nThomas
Watson\n<[email protected]>\",\"sha\":\"1037f3669edb930c4ca27a1891adc2a36bf265c7\"}},\"sourceBranch\":\"main\",\"suggestedTargetBranches\":[],\"targetPullRequestStates\":[{\"branch\":\"main\",\"label\":\"v8.7.0\",\"labelRegex\":\"^v8.7.0$\",\"isSourceBranch\":true,\"state\":\"MERGED\",\"url\":\"https://github.com/elastic/kibana/pull/148326\",\"number\":148326,\"mergeCommit\":{\"message\":\"Upgrade\njson5
dependency (2.2.1 → 2.2.3) (#148326)\\n\\nUpgrade json5
production\ndependency (2.2.1 → 2.2.3).\\r\\nUpgrade json5 dev
dependency (1.0.1 →\n1.0.2) \\r\\nAlso upgrades production dependency
types/json5 to\n2.2.0.\\r\\n\\r\\nChange
log\n(json5):\\r\\nhttps://github.com/json5/json5/blob/main/CHANGELOG.md#v223-code-diff\\r\\n\\r\\ncc\nhttps://github.com/orgs/elastic/teams/kibana-security\\r\\n\\r\\nCo-authored-by:\nThomas
Watson\n<[email protected]>\",\"sha\":\"1037f3669edb930c4ca27a1891adc2a36bf265c7\"}}]}]\nBACKPORT-->\n\nCo-authored-by:
Jeramy Soucy
<[email protected]>"}},{"branch":"8.5","label":"v8.5.4","labelRegex":"^v(\\d+).(\\d+).\\d+$","isSourceBranch":false,"url":"https://github.com/elastic/kibana/pull/148475","number":148475,"state":"MERGED","mergeCommit":{"sha":"c727fa2f8d4abdb6b1f87fc8ecc6029a38ae1ca1","message":"[8.5]
Upgrade json5 dependency (2.2.1 → 2.2.3) (#148326) (#148475)\n\n#
Backport\n\nThis will backport the following commits from `main` to
`8.5`:\n- [Upgrade json5 dependency (2.2.1 →
2.2.3)\n(#148326)](https://github.com/elastic/kibana/pull/148326)\n\n<!---
Backport version: 8.9.7 -->\n\n### Questions ?\nPlease refer to the
[Backport
tool\ndocumentation](https://github.com/sqren/backport)\n\n<!--BACKPORT
[{\"author\":{\"name\":\"Jeramy\nSoucy\",\"email\":\"[email protected]\"},\"sourceCommit\":{\"committedDate\":\"2023-01-05T18:29:39Z\",\"message\":\"Upgrade\njson5
dependency (2.2.1 → 2.2.3) (#148326)\\n\\nUpgrade json5
production\ndependency (2.2.1 → 2.2.3).\\r\\nUpgrade json5 dev
dependency (1.0.1 →\n1.0.2) \\r\\nAlso upgrades production dependency
types/json5 to\n2.2.0.\\r\\n\\r\\nChange
log\n(json5):\\r\\nhttps://github.com/json5/json5/blob/main/CHANGELOG.md#v223-code-diff\\r\\n\\r\\ncc\nhttps://github.com/orgs/elastic/teams/kibana-security\\r\\n\\r\\nCo-authored-by:\nThomas
Watson\n<[email protected]>\",\"sha\":\"1037f3669edb930c4ca27a1891adc2a36bf265c7\",\"branchLabelMapping\":{\"^v8.7.0$\":\"main\",\"^v(\\\\d+).(\\\\d+).\\\\d+$\":\"$1.$2\"}},\"sourcePullRequest\":{\"labels\":[\"Team:Security\",\"release_note:skip\",\"backport:all-open\",\"v8.7.0\"],\"number\":148326,\"url\":\"https://github.com/elastic/kibana/pull/148326\",\"mergeCommit\":{\"message\":\"Upgrade\njson5
dependency (2.2.1 → 2.2.3) (#148326)\\n\\nUpgrade json5
production\ndependency (2.2.1 → 2.2.3).\\r\\nUpgrade json5 dev
dependency (1.0.1 →\n1.0.2) \\r\\nAlso upgrades production dependency
types/json5 to\n2.2.0.\\r\\n\\r\\nChange
log\n(json5):\\r\\nhttps://github.com/json5/json5/blob/main/CHANGELOG.md#v223-code-diff\\r\\n\\r\\ncc\nhttps://github.com/orgs/elastic/teams/kibana-security\\r\\n\\r\\nCo-authored-by:\nThomas
Watson\n<[email protected]>\",\"sha\":\"1037f3669edb930c4ca27a1891adc2a36bf265c7\"}},\"sourceBranch\":\"main\",\"suggestedTargetBranches\":[],\"targetPullRequestStates\":[{\"branch\":\"main\",\"label\":\"v8.7.0\",\"labelRegex\":\"^v8.7.0$\",\"isSourceBranch\":true,\"state\":\"MERGED\",\"url\":\"https://github.com/elastic/kibana/pull/148326\",\"number\":148326,\"mergeCommit\":{\"message\":\"Upgrade\njson5
dependency (2.2.1 → 2.2.3) (#148326)\\n\\nUpgrade json5
production\ndependency (2.2.1 → 2.2.3).\\r\\nUpgrade json5 dev
dependency (1.0.1 →\n1.0.2) \\r\\nAlso upgrades production dependency
types/json5 to\n2.2.0.\\r\\n\\r\\nChange
log\n(json5):\\r\\nhttps://github.com/json5/json5/blob/main/CHANGELOG.md#v223-code-diff\\r\\n\\r\\ncc\nhttps://github.com/orgs/elastic/teams/kibana-security\\r\\n\\r\\nCo-authored-by:\nThomas
Watson\n<[email protected]>\",\"sha\":\"1037f3669edb930c4ca27a1891adc2a36bf265c7\"}}]}]\nBACKPORT-->\n\nCo-authored-by:
Jeramy Soucy <[email protected]>"}}]}] BACKPORT-->
  • Loading branch information
@jeramysoucy
jeramysoucy authored Jan 12, 2023
1 parent 7fea0ad commit 7bb982c
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 16 deletions.
4 changes: 2 additions & 2 deletions package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -556,7 +556,7 @@
"@types/js-yaml": "^3.11.1",
"@types/jsdom": "^16.2.3",
"@types/json-stable-stringify": "^1.0.32",
"@types/json5": "^0.0.30",
"@types/json5": "^2.2.0",
"@types/license-checker": "15.0.0",
"@types/listr": "^0.14.0",
"@types/loader-utils": "^2.0.3",
Expand Down Expand Up @@ -753,7 +753,7 @@
"jest-when": "^3.2.1",
"jsdom": "13.1.0",
"json-schema-typed": "^8.0.1",
"json5": "^1.0.1",
"json5": "^2.2.3",
"jsondiffpatch": "0.4.1",
"license-checker": "^16.0.0",
"listr": "^0.14.1",
Expand Down
28 changes: 14 additions & 14 deletions yarn.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5516,10 +5516,12 @@
resolved "https://registry.yarnpkg.com/@types/json5/-/json5-0.0.29.tgz#ee28707ae94e11d2b827bcbe5270bcea7f3e71ee"
integrity sha1-7ihweulOEdK4J7y+UnC86n8+ce4=

"@types/json5@^0.0.30":
version "0.0.30"
resolved "https://registry.yarnpkg.com/@types/json5/-/json5-0.0.30.tgz#44cb52f32a809734ca562e685c6473b5754a7818"
integrity sha512-sqm9g7mHlPY/43fcSNrCYfOeX9zkTTK+euO5E6+CVijSMm5tTjkVdwdqRkY3ljjIAf8679vps5jKUoJBCLsMDA==
"@types/json5@^2.2.0":
version "2.2.0"
resolved "https://registry.yarnpkg.com/@types/json5/-/json5-2.2.0.tgz#afff29abf9182a7d4a7e39105ca051f11c603d13"
integrity sha512-NrVug5woqbvNZ0WX+Gv4R+L4TGddtmFek2u8RtccAgFZWtS9QXF2xCXY22/M4nzkaKF0q9Fc6M/5rxLDhfwc/A==
dependencies:
json5 "*"

"@types/keyv@*":
version "3.1.1"
Expand Down Expand Up @@ -17783,20 +17785,18 @@ json3@^3.3.2:
resolved "https://registry.yarnpkg.com/json3/-/json3-3.3.2.tgz#3c0434743df93e2f5c42aee7b19bcb483575f4e1"
integrity sha1-PAQ0dD35Pi9cQq7nsZvLSDV19OE=

json5@*, json5@^2.1.0, json5@^2.1.2, json5@^2.1.3, json5@^2.2.3:
version "2.2.3"
resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.3.tgz#78cd6f1a19bdc12b73db5ad0c61efd66c1e29283"
integrity sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==

json5@^1.0.1:
version "1.0.1"
resolved "https://registry.yarnpkg.com/json5/-/json5-1.0.1.tgz#779fb0018604fa854eacbf6252180d83543e3dbe"
integrity sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==
version "1.0.2"
resolved "https://registry.yarnpkg.com/json5/-/json5-1.0.2.tgz#63d98d60f21b313b77c4d6da18bfa69d80e1d593"
integrity sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA==
dependencies:
minimist "^1.2.0"

json5@^2.1.0, json5@^2.1.2, json5@^2.1.3:
version "2.2.0"
resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.0.tgz#2dfefe720c6ba525d9ebd909950f0515316c89a3"
integrity sha512-f+8cldu7X/y7RAJurMEJmdoKXGB/X550w2Nr3tTbezL6RwEE/iMcm+tZnXeoZtKuOq6ft8+CqzEkrIgx1fPoQA==
dependencies:
minimist "^1.2.5"

[email protected]:
version "0.4.1"
resolved "https://registry.yarnpkg.com/jsondiffpatch/-/jsondiffpatch-0.4.1.tgz#9fb085036767f03534ebd46dcd841df6070c5773"
Expand Down

0 comments on commit 7bb982c

Please sign in to comment.