Upgrade carbon packages to release 10.59.17 #8984
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
GilbertCherrie
added
enhancement
dependencies
accessibility
and removed
enhancement
labels
GilbertCherrie
force-pushed
the
upgrade_react
branch
from
6308240 to
422d444
Compare
GilbertCherrie
force-pushed
the
upgrade_react
branch
from
422d444 to
e27eaa4
Compare
GilbertCherrie
changed the title
GilbertCherrie
force-pushed
the
upgrade_react
branch
from
e27eaa4 to
20a4a0f
Compare
GilbertCherrie
force-pushed
the
upgrade_react
branch
from
20a4a0f to
aca48be
Compare
GilbertCherrie
force-pushed
the
upgrade_react
branch
2 times, most recently
from
326b455 to
dc2c38b
Compare
|
@GilbertCherrie , Could you please resolve the conflicts? |
GilbertCherrie
force-pushed
the
upgrade_react
branch
from
dc2c38b to
84f78d5
Compare
|
Checked commit GilbertCherrie@84f78d5 with ruby 2.7.8, rubocop 1.56.3, haml-lint 0.51.0, and yamllint |
DavidResende0
approved these changes
Dec 14, 2023
|
@GilbertCherrie A conflict occurred during the backport of this pull request to If this pull request is based on another pull request that has not been marked for backport, add the appropriate labels to the other pull request. Otherwise, please create a new pull request direct to the Conflict details: diff --cc yarn.lock
index 4c5237e652,39ead9c227..0000000000
--- a/yarn.lock
+++ b/yarn.lock
@@@ -1258,12 -1259,12 +1258,18 @@@ __metadata
languageName: node
linkType: hard
++<<<<<<< HEAD
+"@babel/runtime@npm:^7.1.2, @babel/runtime@npm:^7.10.0, @babel/runtime@npm:^7.10.2, @babel/runtime@npm:^7.12.1, @babel/runtime@npm:^7.15.4, @babel/runtime@npm:^7.16.7, @babel/runtime@npm:^7.19.4, @babel/runtime@npm:^7.3.1, @babel/runtime@npm:^7.6.3, @babel/runtime@npm:^7.8.3, @babel/runtime@npm:^7.8.4, @babel/runtime@npm:^7.9.1, @babel/runtime@npm:^7.9.2":
+ version: 7.23.5
+ resolution: "@babel/runtime@npm:7.23.5"
++=======
+ "@babel/runtime@npm:^7.1.2, @babel/runtime@npm:^7.10.0, @babel/runtime@npm:^7.10.2, @babel/runtime@npm:^7.11.2, @babel/runtime@npm:^7.12.1, @babel/runtime@npm:^7.15.4, @babel/runtime@npm:^7.16.7, @babel/runtime@npm:^7.19.4, @babel/runtime@npm:^7.3.1, @babel/runtime@npm:^7.6.3, @babel/runtime@npm:^7.8.3, @babel/runtime@npm:^7.8.4, @babel/runtime@npm:^7.9.1, @babel/runtime@npm:^7.9.2":
+ version: 7.23.6
+ resolution: "@babel/runtime@npm:7.23.6"
++>>>>>>> 978a9e1ae9 (Merge pull request #8984 from GilbertCherrie/upgrade_react)
dependencies:
regenerator-runtime: "npm:^0.14.0"
- checksum: 4c4ab16f0361c59fb23956e4d0a29935f1f8a64aa8dd37876ce38355b6f4d8f0e54237aacb89c73b1532def60539ddde2d651523c8fa887b30b19a8cf0c465b0
+ checksum: 0f1669f639af30a0a2948ffcefa2c61935f337b0777bd94f8d7bc66bba8e7d4499e725caeb0449540d9c6d67399b733c4e719babb43ce9a0f33095aa01b42b37
languageName: node
linkType: hard
@@@ -2612,13 -2601,13 +2606,22 @@@
linkType: hard
"@types/react@npm:*, @types/react@npm:>=16.9.11":
++<<<<<<< HEAD
+ version: 18.2.42
+ resolution: "@types/react@npm:18.2.42"
++=======
+ version: 18.2.45
+ resolution: "@types/react@npm:18.2.45"
++>>>>>>> 978a9e1ae9 (Merge pull request #8984 from GilbertCherrie/upgrade_react)
dependencies:
"@types/prop-types": "npm:*"
"@types/scheduler": "npm:*"
csstype: "npm:^3.0.2"
++<<<<<<< HEAD
+ checksum: b6ee1873ba551ca7bf87cefff00a615aa4322cd68d425858a2e09be260d8037d7fc68865739d2b05cc88cefa7acd009afdaea43e9856fc6302b322cc8c19464e
++=======
+ checksum: bd27fd8a959fa776965997af89cb04e43e7868416850fdff421b5539f389efa35acae3d55915c9f32d7b00fb388550302bf8a7f06010abf9ad431e5bf58cb774
++>>>>>>> 978a9e1ae9 (Merge pull request #8984 from GilbertCherrie/upgrade_react)
languageName: node
linkType: hard
@@@ -4707,9 -4696,9 +4710,15 @@@
linkType: hard
"caniuse-lite@npm:^1.0.30000981, caniuse-lite@npm:^1.0.30001109, caniuse-lite@npm:^1.0.30001565":
++<<<<<<< HEAD
+ version: 1.0.30001566
+ resolution: "caniuse-lite@npm:1.0.30001566"
+ checksum: fdff43ed498201bf4f6074bd1112bd853e91973b6ccb016049b030948a7d197cba235ac4d93e712d1862b33a3c947bf4e62bad7011ccdac78e5179501b28d04a
++=======
+ version: 1.0.30001570
+ resolution: "caniuse-lite@npm:1.0.30001570"
+ checksum: a9b939e003dd70580cc18bce54627af84f298af7c774415c8d6c99871e7cee13bd8278b67955a979cd338369c73e8821a10b37e607d1fff2fbc8ff92fc489653
++>>>>>>> 978a9e1ae9 (Merge pull request #8984 from GilbertCherrie/upgrade_react)
languageName: node
linkType: hard
@@@ -6761,9 -6769,9 +6789,15 @@@
linkType: hard
"electron-to-chromium@npm:^1.4.601":
++<<<<<<< HEAD
+ version: 1.4.607
+ resolution: "electron-to-chromium@npm:1.4.607"
+ checksum: 3670335ae7c65a4dd70e3fdf94de9ef8c8d66c3b55551ddd951e39a3ad1d2af0f04f014c1df969e67632c1198ccba8bece1629302a083b043b826ac13abb3d3c
++=======
+ version: 1.4.612
+ resolution: "electron-to-chromium@npm:1.4.612"
+ checksum: 3c7c09d778e68aa161637a934dc1466fb87385ab3b964fd96399dfb8701c7fbe1ab1576cc25f02a2f8c618b2c4d8800379fdd29f121735e59277e67a4e783fab
++>>>>>>> 978a9e1ae9 (Merge pull request #8984 from GilbertCherrie/upgrade_react)
languageName: node
linkType: hard
@@@ -18288,8 -18277,8 +18303,13 @@@
linkType: hard
"ws@npm:^8.4.2":
++<<<<<<< HEAD
+ version: 8.14.2
+ resolution: "ws@npm:8.14.2"
++=======
+ version: 8.15.1
+ resolution: "ws@npm:8.15.1"
++>>>>>>> 978a9e1ae9 (Merge pull request #8984 from GilbertCherrie/upgrade_react)
peerDependencies:
bufferutil: ^4.0.1
utf-8-validate: ">=5.0.2"
@@@ -18298,7 -18287,7 +18318,11 @@@
optional: true
utf-8-validate:
optional: true
++<<<<<<< HEAD
+ checksum: 815ff01d9bc20a249b2228825d9739268a03a4408c2e0b14d49b0e2ae89d7f10847e813b587ba26992bdc33e9d03bed131e4cae73ff996baf789d53e99c31186
++=======
+ checksum: 746a3102d43e8df7b09f5814bec858f12d10185a7abd655537f3291b687d440bb80fc9d1e082f8dee42d4d74307f78a96810e18a2c8e13053b003c6608c1c648
++>>>>>>> 978a9e1ae9 (Merge pull request #8984 from GilbertCherrie/upgrade_react)
languageName: node
linkType: hard
|
|
Backported to |
Fryguy
pushed a commit
that referenced
this pull request
Jan 5, 2024
Upgrade carbon packages to release 10.59.17 (cherry picked from commit 978a9e1)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Upgraded Carbon Components React to 7.59.17. Also upgraded dependent packages React, React-dom, eslint-plugin-jsx-a11y and stylelint.
This upgrade is required in order to fix Accessibility violations with the Data Table component.