Manually sync main -> dev (4.2.0)

.changeset/cuddly-dolphins-yell.md

@@ -0,0 +1,5 @@
+---
+"react-magma-docs": patch
+---
+
+build: Resolve merge conflicts when pulling main -> dev

.changeset/pre.json

@@ -10,22 +10,5 @@
     "react-magma-docs": "5.0.3",
     "react-magma-landing": "1.1.2"
   },
-  "changesets": [
-    "dropdown-menuItemRole",
-    "dropdownContent-falseChild",
-    "feat-dropdownExpandableMenu",
-    "feat-optionalPerPageSelect",
-    "fix-datePickerEscape",
-    "fix-dropdownDocsStorybook",
-    "fix-expandableDropdown",
-    "fix-expandableDropdownDisabled",
-    "fix-labelsColors",
-    "fix-modalEscape",
-    "fix-passInputLarge",
-    "fix-radioGroup",
-    "inputHeight",
-    "nativeSelectHeight",
-    "sortArrows",
-    "update-modalPadding"
-  ]
-}
+  "changesets": []
+}

packages/charts/CHANGELOG.md

@@ -1,5 +1,7 @@
 # @react-magma/charts
 
+## 5.0.0
+
 ## 5.0.0-next.0
 
 ### Patch Changes
@@ -9,8 +11,6 @@
 
 ## 4.0.2
 
-## 4.0.2-next.0
-
 ### Patch Changes
 
 - Updated dependencies [871820e8d]
@@ -22,22 +22,14 @@
 
 - 1238e8d: Fix handleKeyboardInstructionsButtonKeydown type error
 
-## 4.0.1-next.0
-
-### Patch Changes
-
-- a81b0728b: Fix handleKeyboardInstructionsButtonKeydown type error
-
 ## 4.0.0
 
-## 4.0.0-next.1
-
 ### Patch Changes
 
 - Updated dependencies [3d00dcc7e]
   - [email protected]
 
-## 3.0.1-next.0
+## 3.0.1
 
 ### Patch Changes
 
@@ -50,95 +42,34 @@
 
 - c01c53838: chore: Update to React v17.0.2
 
-## 3.0.0-next.0
-
-### Major Changes
-
-- c01c53838: chore: Update to React v17.0.2
-
-### Patch Changes
-
-- Updated dependencies [adba671f3]
-- Updated dependencies [c01c53838]
-  - [email protected]
-
 ## 2.0.1
 
 ### Patch Changes
 
 - 7b4549726: Update react-magma-icons version to 2.3.6
 
-## 2.0.1-next.1
-
-### Patch Changes
-
-- 7b4549726: Update react-magma-icons version to 2.3.6
-
-## 2.0.1-next.0
-
-### Patch Changes
-
-- Updated dependencies [f5189569b]
-  - [email protected]
-
 ## 2.0.0
 
 ### Patch Changes
 
 - 95fc5ae7: chore(npm/node): Update versions
 
-## 2.0.0-next.1
-
-### Patch Changes
-
-- 95fc5ae72: chore(npm/node): Update versions
-
-## 2.0.0-next.0
-
-### Patch Changes
-
-- Updated dependencies [47015f38]
-  - [email protected]
-
 ## 1.0.2
 
 ### Patch Changes
 
 - 0de78513: build(deps): Bump react-magma-icons to 2.3.4
 
-## 1.0.2-next.1
-
-### Patch Changes
-
-- 0de78513c: build(deps): Bump react-magma-icons to 2.3.4
-
-## 1.0.2-next.0
-
-### Patch Changes
-
-- Updated dependencies [17ee57afe]
-  - [email protected]
-
 ## 1.0.1
 
-## 1.0.1-next.0
-
 ### Patch Changes
 
 - Updated dependencies [fc8a20bf]
   - [email protected]
 
 ## 1.0.0
 
-## 1.0.0-next.0
-
 ### Patch Changes
 
 - Updated dependencies [366b25af]
   - [email protected]
-
-## 0.0.4
-
-## 0.0.3
-
-## 0.0.2

packages/charts/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@react-magma/charts",
-  "version": "5.0.0-next.0",
+  "version": "5.0.0",
   "publishConfig": {
     "access": "public"
   },
@@ -41,7 +41,7 @@
     "@emotion/styled": "^10.0.27",
     "react": "^17.0.2",
     "react-dom": "^17.0.2",
-    "react-magma-dom": "^4.2.0-next.0",
+    "react-magma-dom": "^4.2.0",
     "react-magma-icons": "^3.0.0"
   }
 }

packages/dropzone/CHANGELOG.md

@@ -1,5 +1,7 @@
 # Change Log
 
+## 5.0.0
+
 ## 5.0.0-next.0
 
 ### Patch Changes

packages/dropzone/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@react-magma/dropzone",
-  "version": "5.0.0-next.0",
+  "version": "5.0.0",
   "publishConfig": {
     "access": "public"
   },
@@ -42,7 +42,7 @@
     "@emotion/styled": "^10.0.27",
     "react": "^17.0.2",
     "react-dom": "^17.0.2",
-    "react-magma-dom": "^4.2.0-next.0",
+    "react-magma-dom": "^4.2.0",
     "react-magma-icons": "^3.0.0"
   }
 }