diff --git a/.changeset/pre.json b/.changeset/pre.json
index 8c99af48589..8c464ea2416 100644
--- a/.changeset/pre.json
+++ b/.changeset/pre.json
@@ -10,6 +10,7 @@
   "changesets": [
     "blue-points-exist",
     "bright-rivers-swim",
+    "brown-tools-explain",
     "clean-cooks-attend",
     "famous-needles-wonder",
     "five-trainers-report",
@@ -29,6 +30,7 @@
     "mean-glasses-chew",
     "mighty-kids-report",
     "mighty-shrimps-shout",
+    "nasty-onions-fly",
     "nervous-humans-shave",
     "nine-vans-bow",
     "plenty-cooks-grow",
@@ -55,6 +57,7 @@
     "thin-tables-sneeze",
     "tricky-shoes-check",
     "twelve-trainers-tap",
-    "weak-numbers-bow"
+    "weak-numbers-bow",
+    "witty-ligers-press"
   ]
 }
diff --git a/packages/react-docgen-cli/CHANGELOG.md b/packages/react-docgen-cli/CHANGELOG.md
index f26b428678a..1dfd0eae5c3 100644
--- a/packages/react-docgen-cli/CHANGELOG.md
+++ b/packages/react-docgen-cli/CHANGELOG.md
@@ -1,5 +1,19 @@
 # Release Notes
 
+## 1.0.0-beta.4
+
+### Patch Changes
+
+- [#782](https://github.com/reactjs/react-docgen/pull/782)
+  [`72ac984`](https://github.com/reactjs/react-docgen/commit/72ac9841f02f1f6b925247621bc5aa56d3ba4267)
+  Thanks [@renovate](https://github.com/apps/renovate)! - Update dependency
+  commander to v10.0.1
+
+- Updated dependencies
+  [[`a684d82`](https://github.com/reactjs/react-docgen/commit/a684d8281044b3f8c8baecc9148cd4ef2b8fd409),
+  [`e08e08d`](https://github.com/reactjs/react-docgen/commit/e08e08d6cd56c833fd123019639dca9d819cd7ab)]:
+  - react-docgen@6.0.0-beta.7
+
 ## 1.0.0-beta.3
 
 ### Minor Changes
diff --git a/packages/react-docgen-cli/package.json b/packages/react-docgen-cli/package.json
index 8b4028fbd13..372499f1451 100644
--- a/packages/react-docgen-cli/package.json
+++ b/packages/react-docgen-cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@react-docgen/cli",
-  "version": "1.0.0-beta.3",
+  "version": "1.0.0-beta.4",
   "description": "A CLI to extract information from React components for documentation generation.",
   "repository": "reactjs/react-docgen",
   "type": "module",
@@ -31,7 +31,7 @@
     "commander": "10.0.1",
     "debug": "4.3.4",
     "fast-glob": "3.2.12",
-    "react-docgen": "workspace:6.0.0-beta.6",
+    "react-docgen": "workspace:6.0.0-beta.7",
     "slash": "5.0.0"
   },
   "devDependencies": {
diff --git a/packages/react-docgen/CHANGELOG.md b/packages/react-docgen/CHANGELOG.md
index 85932583649..05f0686dda5 100644
--- a/packages/react-docgen/CHANGELOG.md
+++ b/packages/react-docgen/CHANGELOG.md
@@ -1,5 +1,19 @@
 # Release Notes
 
+## 6.0.0-beta.7
+
+### Patch Changes
+
+- [#767](https://github.com/reactjs/react-docgen/pull/767)
+  [`a684d82`](https://github.com/reactjs/react-docgen/commit/a684d8281044b3f8c8baecc9148cd4ef2b8fd409)
+  Thanks [@danez](https://github.com/danez)! - Fix handling of `PropTypes.oneOf`
+  to handle unresolved imported values correctly
+
+- [#769](https://github.com/reactjs/react-docgen/pull/769)
+  [`e08e08d`](https://github.com/reactjs/react-docgen/commit/e08e08d6cd56c833fd123019639dca9d819cd7ab)
+  Thanks [@danez](https://github.com/danez)! - Correctly resolve the values in
+  an `Object.values()` call
+
 ## 6.0.0-beta.6
 
 ### Major Changes
diff --git a/packages/react-docgen/package.json b/packages/react-docgen/package.json
index 604fe152b50..7e2ebf5409a 100644
--- a/packages/react-docgen/package.json
+++ b/packages/react-docgen/package.json
@@ -1,6 +1,6 @@
 {
   "name": "react-docgen",
-  "version": "6.0.0-beta.6",
+  "version": "6.0.0-beta.7",
   "description": "A library to extract information from React components for documentation generation.",
   "repository": "reactjs/react-docgen",
   "type": "module",
diff --git a/packages/website/package.json b/packages/website/package.json
index 7bd52e2694d..c7927142f49 100644
--- a/packages/website/package.json
+++ b/packages/website/package.json
@@ -26,7 +26,7 @@
     "postcss": "8.4.23",
     "postcss-lightningcss": "0.7.0",
     "react": "18.2.0",
-    "react-docgen": "workspace:6.0.0-beta.6",
+    "react-docgen": "workspace:6.0.0-beta.7",
     "react-dom": "18.2.0",
     "tailwindcss": "3.3.2"
   },
diff --git a/packages/website/src/pages/docs/release-notes/cli.mdx b/packages/website/src/pages/docs/release-notes/cli.mdx
index f26b428678a..1dfd0eae5c3 100644
--- a/packages/website/src/pages/docs/release-notes/cli.mdx
+++ b/packages/website/src/pages/docs/release-notes/cli.mdx
@@ -1,5 +1,19 @@
 # Release Notes
 
+## 1.0.0-beta.4
+
+### Patch Changes
+
+- [#782](https://github.com/reactjs/react-docgen/pull/782)
+  [`72ac984`](https://github.com/reactjs/react-docgen/commit/72ac9841f02f1f6b925247621bc5aa56d3ba4267)
+  Thanks [@renovate](https://github.com/apps/renovate)! - Update dependency
+  commander to v10.0.1
+
+- Updated dependencies
+  [[`a684d82`](https://github.com/reactjs/react-docgen/commit/a684d8281044b3f8c8baecc9148cd4ef2b8fd409),
+  [`e08e08d`](https://github.com/reactjs/react-docgen/commit/e08e08d6cd56c833fd123019639dca9d819cd7ab)]:
+  - react-docgen@6.0.0-beta.7
+
 ## 1.0.0-beta.3
 
 ### Minor Changes
diff --git a/packages/website/src/pages/docs/release-notes/react-docgen.mdx b/packages/website/src/pages/docs/release-notes/react-docgen.mdx
index 85932583649..05f0686dda5 100644
--- a/packages/website/src/pages/docs/release-notes/react-docgen.mdx
+++ b/packages/website/src/pages/docs/release-notes/react-docgen.mdx
@@ -1,5 +1,19 @@
 # Release Notes
 
+## 6.0.0-beta.7
+
+### Patch Changes
+
+- [#767](https://github.com/reactjs/react-docgen/pull/767)
+  [`a684d82`](https://github.com/reactjs/react-docgen/commit/a684d8281044b3f8c8baecc9148cd4ef2b8fd409)
+  Thanks [@danez](https://github.com/danez)! - Fix handling of `PropTypes.oneOf`
+  to handle unresolved imported values correctly
+
+- [#769](https://github.com/reactjs/react-docgen/pull/769)
+  [`e08e08d`](https://github.com/reactjs/react-docgen/commit/e08e08d6cd56c833fd123019639dca9d819cd7ab)
+  Thanks [@danez](https://github.com/danez)! - Correctly resolve the values in
+  an `Object.values()` call
+
 ## 6.0.0-beta.6
 
 ### Major Changes
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 91165388171..a736b9b5a6e 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -134,7 +134,7 @@ importers:
         specifier: 3.2.12
         version: 3.2.12
       react-docgen:
-        specifier: workspace:6.0.0-beta.6
+        specifier: workspace:6.0.0-beta.7
         version: link:../react-docgen
       slash:
         specifier: 5.0.0
@@ -166,7 +166,7 @@ importers:
         version: 18.2.1
       '@uiw/react-codemirror':
         specifier: 4.19.16
-        version: 4.19.16(@babel/runtime@7.21.0)(@codemirror/autocomplete@6.5.1)(@codemirror/language@6.6.0)(@codemirror/lint@6.2.1)(@codemirror/search@6.3.0)(@codemirror/state@6.2.0)(@codemirror/theme-one-dark@6.1.2)(@codemirror/view@6.10.0)(codemirror@6.0.1)(react-dom@18.2.0)(react@18.2.0)
+        version: 4.19.16(@codemirror/view@6.10.0)(react-dom@18.2.0)(react@18.2.0)
       clsx:
         specifier: 1.2.1
         version: 1.2.1
@@ -192,7 +192,7 @@ importers:
         specifier: 18.2.0
         version: 18.2.0
       react-docgen:
-        specifier: workspace:6.0.0-beta.6
+        specifier: workspace:6.0.0-beta.7
         version: link:../react-docgen
       react-dom:
         specifier: 18.2.0
@@ -624,13 +624,10 @@ packages:
       prettier: 2.8.8
     dev: true
 
-  /@codemirror/autocomplete@6.5.1(@codemirror/language@6.6.0)(@codemirror/state@6.2.0)(@codemirror/view@6.10.0)(@lezer/common@1.0.2):
+  /@codemirror/autocomplete@6.5.1(@codemirror/view@6.10.0):
     resolution: {integrity: sha512-/Sv9yJmqyILbZ26U4LBHnAtbikuVxWUp+rQ8BXuRGtxZfbfKOY/WPbsUtvSP2h0ZUZMlkxV/hqbKRFzowlA6xw==}
     peerDependencies:
-      '@codemirror/language': ^6.0.0
-      '@codemirror/state': ^6.0.0
       '@codemirror/view': ^6.0.0
-      '@lezer/common': ^1.0.0
     dependencies:
       '@codemirror/language': 6.6.0
       '@codemirror/state': 6.2.0
@@ -650,7 +647,7 @@ packages:
   /@codemirror/lang-javascript@6.1.7:
     resolution: {integrity: sha512-KXKqxlZ4W6t5I7i2ScmITUD3f/F5Cllk3kj0De9P9mFeYVfhOVOWuDLgYiLpk357u7Xh4dhqjJAnsNPPoTLghQ==}
     dependencies:
-      '@codemirror/autocomplete': 6.5.1(@codemirror/language@6.6.0)(@codemirror/state@6.2.0)(@codemirror/view@6.10.0)(@lezer/common@1.0.2)
+      '@codemirror/autocomplete': 6.5.1(@codemirror/view@6.10.0)
       '@codemirror/language': 6.6.0
       '@codemirror/lint': 6.2.1
       '@codemirror/state': 6.2.0
@@ -1728,18 +1725,12 @@ packages:
       eslint-visitor-keys: 3.4.0
     dev: true
 
-  /@uiw/codemirror-extensions-basic-setup@4.19.16(@codemirror/autocomplete@6.5.1)(@codemirror/commands@6.2.3)(@codemirror/language@6.6.0)(@codemirror/lint@6.2.1)(@codemirror/search@6.3.0)(@codemirror/state@6.2.0)(@codemirror/view@6.10.0):
+  /@uiw/codemirror-extensions-basic-setup@4.19.16(@codemirror/view@6.10.0):
     resolution: {integrity: sha512-Xm0RDpyYVZ/8hWqaBs3+wZwi4uLwZUBwp/uCt89X80FeR6mr3BFuC+a+gcDO4dBu3l+WQE3jJdhjKjB2TCY/PQ==}
     peerDependencies:
-      '@codemirror/autocomplete': '>=6.0.0'
-      '@codemirror/commands': '>=6.0.0'
-      '@codemirror/language': '>=6.0.0'
-      '@codemirror/lint': '>=6.0.0'
-      '@codemirror/search': '>=6.0.0'
-      '@codemirror/state': '>=6.0.0'
       '@codemirror/view': '>=6.0.0'
     dependencies:
-      '@codemirror/autocomplete': 6.5.1(@codemirror/language@6.6.0)(@codemirror/state@6.2.0)(@codemirror/view@6.10.0)(@lezer/common@1.0.2)
+      '@codemirror/autocomplete': 6.5.1(@codemirror/view@6.10.0)
       '@codemirror/commands': 6.2.3
       '@codemirror/language': 6.6.0
       '@codemirror/lint': 6.2.1
@@ -1748,14 +1739,10 @@ packages:
       '@codemirror/view': 6.10.0
     dev: false
 
-  /@uiw/react-codemirror@4.19.16(@babel/runtime@7.21.0)(@codemirror/autocomplete@6.5.1)(@codemirror/language@6.6.0)(@codemirror/lint@6.2.1)(@codemirror/search@6.3.0)(@codemirror/state@6.2.0)(@codemirror/theme-one-dark@6.1.2)(@codemirror/view@6.10.0)(codemirror@6.0.1)(react-dom@18.2.0)(react@18.2.0):
+  /@uiw/react-codemirror@4.19.16(@codemirror/view@6.10.0)(react-dom@18.2.0)(react@18.2.0):
     resolution: {integrity: sha512-uElraR7Mvwz2oZKrmtF5hmIB8dAlIiU65nfg484e/V9k4PV6/5KtPUQL3JPO4clH2pcd+TQqRTQrFFkP/D25ew==}
     peerDependencies:
-      '@babel/runtime': '>=7.11.0'
-      '@codemirror/state': '>=6.0.0'
-      '@codemirror/theme-one-dark': '>=6.0.0'
       '@codemirror/view': '>=6.0.0'
-      codemirror: '>=6.0.0'
       react: '>=16.8.0'
       react-dom: '>=16.8.0'
     dependencies:
@@ -1764,15 +1751,10 @@ packages:
       '@codemirror/state': 6.2.0
       '@codemirror/theme-one-dark': 6.1.2
       '@codemirror/view': 6.10.0
-      '@uiw/codemirror-extensions-basic-setup': 4.19.16(@codemirror/autocomplete@6.5.1)(@codemirror/commands@6.2.3)(@codemirror/language@6.6.0)(@codemirror/lint@6.2.1)(@codemirror/search@6.3.0)(@codemirror/state@6.2.0)(@codemirror/view@6.10.0)
-      codemirror: 6.0.1(@lezer/common@1.0.2)
+      '@uiw/codemirror-extensions-basic-setup': 4.19.16(@codemirror/view@6.10.0)
+      codemirror: 6.0.1
       react: 18.2.0
       react-dom: 18.2.0(react@18.2.0)
-    transitivePeerDependencies:
-      - '@codemirror/autocomplete'
-      - '@codemirror/language'
-      - '@codemirror/lint'
-      - '@codemirror/search'
     dev: false
 
   /@vitest/coverage-c8@0.30.1(vitest@0.30.1):
@@ -2371,18 +2353,16 @@ packages:
     engines: {node: '>=6'}
     dev: false
 
-  /codemirror@6.0.1(@lezer/common@1.0.2):
+  /codemirror@6.0.1:
     resolution: {integrity: sha512-J8j+nZ+CdWmIeFIGXEFbFPtpiYacFMDR8GlHK3IyHQJMCaVRfGx9NT+Hxivv1ckLWPvNdZqndbr/7lVhrf/Svg==}
     dependencies:
-      '@codemirror/autocomplete': 6.5.1(@codemirror/language@6.6.0)(@codemirror/state@6.2.0)(@codemirror/view@6.10.0)(@lezer/common@1.0.2)
+      '@codemirror/autocomplete': 6.5.1(@codemirror/view@6.10.0)
       '@codemirror/commands': 6.2.3
       '@codemirror/language': 6.6.0
       '@codemirror/lint': 6.2.1
       '@codemirror/search': 6.3.0
       '@codemirror/state': 6.2.0
       '@codemirror/view': 6.10.0
-    transitivePeerDependencies:
-      - '@lezer/common'
     dev: false
 
   /color-convert@1.9.3: