Manually sync main -> dev (4.3.0) (#1184)

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: github-bot <[email protected]> Co-authored-by: Jerrod Heiser <[email protected]> Co-authored-by: noahwebs <[email protected]> Co-authored-by: ccedrone <[email protected]>
cengage · Jan 19, 2024 · f54eb31 · f54eb31 · github-actions · Jan 19, 2024
1 parent aa5e27b
commit f54eb31
Show file tree

Hide file tree

Showing 23 changed files with 49 additions and 144 deletions.
diff --git a/.changeset/chartColors.md b/.changeset/chartColors.md
diff --git a/.changeset/cuddly-dolphins-yell.md b/.changeset/cuddly-dolphins-yell.md
diff --git a/.changeset/feat-paragraphMargins.md b/.changeset/feat-paragraphMargins.md
diff --git a/.changeset/feat-selectChildren.md b/.changeset/feat-selectChildren.md
diff --git a/.changeset/few-hotels-walk.md b/.changeset/few-hotels-walk.md
@@ -0,0 +1,5 @@
+---
+"react-magma-docs": patch
+---
+
+build: Resolve merge conflicts when pulling main -> dev (4.3.0)
diff --git a/.changeset/fix-additionalContent.md b/.changeset/fix-additionalContent.md
diff --git a/.changeset/fix-additionalContentDocs.md b/.changeset/fix-additionalContentDocs.md
diff --git a/.changeset/fix-expressiveText.md b/.changeset/fix-expressiveText.md
diff --git a/.changeset/fix-modalPadding.md b/.changeset/fix-modalPadding.md
diff --git a/.changeset/fix-modalStorybook.md b/.changeset/fix-modalStorybook.md
diff --git a/.changeset/loud-poets-eat.md b/.changeset/loud-poets-eat.md
diff --git a/.changeset/pre.json b/.changeset/pre.json
diff --git a/.changeset/strong-fans-itch.md b/.changeset/strong-fans-itch.md
diff --git a/packages/charts/package.json b/packages/charts/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@react-magma/charts",
-  "version": "6.0.0-next.1",
+  "version": "6.0.0",
   "publishConfig": {
     "access": "public"
   },
@@ -30,7 +30,7 @@
     "@emotion/styled": "^10.0.27",
     "react": "^17.0.2",
     "react-dom": "^17.0.2",
-    "react-magma-dom": "^4.3.0-next.2",
+    "react-magma-dom": "^4.3.0",
     "react-magma-icons": "^3.0.0"
   },
   "dependencies": {
@@ -41,7 +41,7 @@
     "@emotion/styled": "^10.0.27",
     "react": "^17.0.2",
     "react-dom": "^17.0.2",
-    "react-magma-dom": "^4.3.0-next.2",
+    "react-magma-dom": "^4.3.0",
     "react-magma-icons": "^3.0.0"
   }
 }
diff --git a/packages/dropzone/package.json b/packages/dropzone/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@react-magma/dropzone",
-  "version": "6.0.0-next.1",
+  "version": "6.0.0",
   "publishConfig": {
     "access": "public"
   },
@@ -30,7 +30,7 @@
     "@emotion/styled": "^10.0.27",
     "react": "^17.0.2",
     "react-dom": "^17.0.2",
-    "react-magma-dom": "^4.3.0-next.2",
+    "react-magma-dom": "^4.3.0",
     "react-magma-icons": "^3.0.0"
   },
   "dependencies": {
@@ -42,7 +42,7 @@
     "@emotion/styled": "^10.0.27",
     "react": "^17.0.2",
     "react-dom": "^17.0.2",
-    "react-magma-dom": "^4.3.0-next.2",
+    "react-magma-dom": "^4.3.0",
     "react-magma-icons": "^3.0.0"
   }
 }
diff --git a/packages/react-magma-dom/CHANGELOG.md b/packages/react-magma-dom/CHANGELOG.md
@@ -1,53 +1,19 @@
-## 4.2.0
-
-## 4.3.0-next.7
-
-### Patch Changes
-
-- 3fc9e50ca: fix(Modal): Fixed Storybook Inverse example.
-
-## 4.3.0-next.6
-
-### Patch Changes
-
-- 421b9091a: fix(Modal): Fixed bottom padding on the Modal header.
-
-## 4.3.0-next.5
+## 4.3.0
 
 ### Minor Changes
 
-- 8fa4252f4: feat(Paragraph): New `noTopMargin` and `noBottomMargin` props that allow customization of which margin to remove.
-
-## 4.3.0-next.4
-
-### Patch Changes
-
-- 1fb88b6fc: fix: Updates to the expressive font styles for both desktop and mobile.
-
-## 4.3.0-next.3
-
-### Minor Changes
-
-- 5e438ab0a: fix(Select/NativeSelect): Fixed alignment issues in Select regarding additional content icon. Fixed duplicate additional content in Native Select.
-
-## 4.3.0-next.2
-
-### Minor Changes
-
-- c47fc18b4: feat(Select/NativeSelect): New `additionalContent` prop to provide the ability to add extra content inline with the label similar to the Input component.
-
-## 4.2.1-next.1
-
-### Patch Changes
-
-- e6ca26b27: Adding in chartColors to theme.
-
-## 4.2.1-next.0
+- cfc20a479: feat(Paragraph): New `noTopMargin` and `noBottomMargin` props that allow customization of which margin to remove.
+- cfc20a479: feat(Select/NativeSelect): New `additionalContent` prop to provide the ability to add extra content inline with the label similar to the Input component.
+- cfc20a479: fix(Select/NativeSelect): Fixed alignment issues in Select regarding additional content icon. Fixed duplicate additional content in Native Select.
 
 ### Patch Changes
 
+- 421b9091a: fix(Modal): Fixed bottom padding on the Modal header
+- 1fb88b6fc: fix: Updates to the expressive font styles for both desktop and mobile
 - fc3098851: build(deps): bump browserify-sign from 4.2.1 to 4.2.2
 
+## 4.2.0
+
 ### Minor Changes
 
 - de22be548: feat(DropdownExpandableMenu): A new menu item display for the Dropdown component which enables expandable lists by one level

diff --git a/packages/react-magma-dom/package.json b/packages/react-magma-dom/package.json
@@ -1,6 +1,6 @@
 {
   "name": "react-magma-dom",
-  "version": "4.3.0-next.7",
+  "version": "4.3.0",
   "description": "",
   "main": "dist/index.js",
   "module": "dist/esm/index.js",

diff --git a/packages/react-magma-dom/src/components/Modal/Modal.stories.tsx b/packages/react-magma-dom/src/components/Modal/Modal.stories.tsx
@@ -437,4 +437,4 @@ export const Inverse = () => {
       </Container>
     </>
   );
-};
+};
diff --git a/packages/schema-renderer/package.json b/packages/schema-renderer/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@react-magma/schema-renderer",
-  "version": "6.0.0-next.1",
+  "version": "6.0.0",
   "publishConfig": {
     "access": "public"
   },
@@ -27,7 +27,7 @@
     "downshift": "^5.4.5",
     "react": "^17.0.2",
     "react-dom": "^17.0.2",
-    "react-magma-dom": "^4.3.0-next.2",
+    "react-magma-dom": "^4.3.0",
     "react-magma-icons": "^3.0.0",
     "uuid": "^8.3.0"
   },
@@ -41,7 +41,7 @@
     "react": "^17.0.2",
     "react-dom": "^17.0.2",
     "react-dropzone": "11.3.2",
-    "react-magma-dom": "^4.3.0-next.2",
+    "react-magma-dom": "^4.3.0",
     "react-magma-icons": "^3.0.0",
     "tsdx": "^0.14.1",
     "uuid": "^8.3.0"

diff --git a/patterns/header/package.json b/patterns/header/package.json
@@ -2,7 +2,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "8.0.0-next.1",
+  "version": "8.0.0",
   "license": "MIT",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",
@@ -26,7 +26,7 @@
     "downshift": "^5.4.5",
     "react": "^17.0.2",
     "react-dom": "^17.0.2",
-    "react-magma-dom": "^4.3.0-next.2",
+    "react-magma-dom": "^4.3.0",
     "react-magma-icons": "^3.0.0",
     "uuid": "^8.3.0"
   },
@@ -38,7 +38,7 @@
     "downshift": "^5.4.5",
     "react": "^17.0.2",
     "react-dom": "^17.0.2",
-    "react-magma-dom": "^4.3.0-next.2",
+    "react-magma-dom": "^4.3.0",
     "react-magma-icons": "^3.0.0",
     "uuid": "^8.3.0"
   },

diff --git a/website/react-magma-docs/package.json b/website/react-magma-docs/package.json
@@ -1,7 +1,7 @@
 {
   "name": "react-magma-docs",
   "description": "React Magma docs",
-  "version": "5.0.5-next.9",
+  "version": "5.0.5",
   "private": true,
   "repository": {
     "type": "git",
@@ -11,15 +11,15 @@
   "homepage": "https://react-magma.cengage.com",
   "dependencies": {
     "@babel/plugin-transform-react-jsx": "7.10.4",
-    "@cengage-patterns/header": "8.0.0-next.1",
+    "@cengage-patterns/header": "8.0.0",
     "@data-driven-forms/react-form-renderer": "^3.6.0",
     "@emotion/core": "^10.1.1",
     "@emotion/styled": "^10.0.27",
     "@mdx-js/mdx": "^1.5.5",
     "@mdx-js/react": "^1.5.5",
-    "@react-magma/charts": "^6.0.0-next.1",
-    "@react-magma/dropzone": "6.0.0-next.1",
-    "@react-magma/schema-renderer": "^6.0.0-next.1",
+    "@react-magma/charts": "^6.0.0",
+    "@react-magma/dropzone": "6.0.0",
+    "@react-magma/schema-renderer": "^6.0.0",
     "buble": "0.19.4",
     "buffer": "^6.0.3",
     "core-js": "^3.1.4",
@@ -49,7 +49,7 @@
     "react-focus-lock": "^2.9.2",
     "react-helmet": "5.2.0",
     "react-live": "^2.2.1",
-    "react-magma-dom": "4.3.0-next.7",
+    "react-magma-dom": "4.3.0",
     "react-magma-icons": "^3.0.0",
     "react-spring": "6.1.9",
     "semver": "^7.3.4",

diff --git a/website/react-magma-docs/src/pages/api-intro/changelog.mdx b/website/react-magma-docs/src/pages/api-intro/changelog.mdx
@@ -5,6 +5,21 @@ order: 4
 
 <PageContent componentName="changelog" type="api_intro">
 
+## 4.3.0
+
+### Minor Changes
+
+- 8fa4252f4: feat(Paragraph): New `noTopMargin` and `noBottomMargin` props that allow customization of which margin to remove
+- c47fc18b4: feat(Select/NativeSelect): New `additionalContent` prop to provide the ability to add extra content inline with the label similar to the Input component
+- 5e438ab0a: fix(Select): Fixed alignment issues in Select regarding additional content icon.
+- 5e438ab0a: fix(NativeSelect): Fixed duplicate additional content in Native Select.
+
+### Patch Changes
+
+- 421b9091a: fix(Modal): Fixed bottom padding on the Modal header
+- 1fb88b6fc: fix: Updates to the expressive font styles for both desktop and mobile
+- fc3098851: build(deps): bump browserify-sign from 4.2.1 to 4.2.2
+
 ## 4.2.0
 
 ### Minor Changes

diff --git a/website/react-magma-landing/package.json b/website/react-magma-landing/package.json
@@ -1,6 +1,6 @@
 {
   "name": "react-magma-landing",
-  "version": "1.1.3-next.0",
+  "version": "1.1.3",
   "description": "",
   "main": "index.js",
   "scripts": {
-Original file line number
+Diff line change
@@ Expand Up / @@ -437,4 +437,4 @@ export const Inverse = () => { @@
           </Container>
         </>
       );
-    };
+    };