Merge branch 'next' into fix/SAPP-1931

sanity-io · Jan 6, 2025 · e11a664 · e11a664
2 parents f32c71b + 4e60fe9
commit e11a664
Show file tree

Hide file tree

Showing 15 changed files with 398 additions and 382 deletions.
diff --git a/dev/design-studio/package.json b/dev/design-studio/package.json
@@ -32,7 +32,7 @@
   },
   "dependencies": {
     "@sanity/icons": "^3.5.7",
-    "@sanity/ui": "^2.10.17",
+    "@sanity/ui": "^2.11.0",
     "react": "^18.3.1",
     "react-dom": "^18.3.1",
     "sanity": "workspace:*",

diff --git a/dev/embedded-studio/package.json b/dev/embedded-studio/package.json
@@ -8,7 +8,7 @@
     "preview": "vite preview"
   },
   "dependencies": {
-    "@sanity/ui": "^2.10.17",
+    "@sanity/ui": "^2.11.0",
     "react": "^18.3.1",
     "react-dom": "^18.3.1",
     "sanity": "workspace:*",

diff --git a/dev/page-building-studio/package.json b/dev/page-building-studio/package.json
@@ -13,7 +13,7 @@
   },
   "dependencies": {
     "@sanity/vision": "workspace:*",
-    "babel-plugin-react-compiler": "19.0.0-beta-55955c9-20241229",
+    "babel-plugin-react-compiler": "19.0.0-beta-63e3235-20250105",
     "react": "^18.2.0",
     "react-compiler-runtime": "19.0.0-beta-55955c9-20241229",
     "react-dom": "^18.2.0",

diff --git a/dev/starter-studio/package.json b/dev/starter-studio/package.json
@@ -12,7 +12,7 @@
     "start": "../.bin/sanity start --port 3337"
   },
   "dependencies": {
-    "babel-plugin-react-compiler": "19.0.0-beta-55955c9-20241229",
+    "babel-plugin-react-compiler": "19.0.0-beta-63e3235-20250105",
     "react": "^18.3.1",
     "react-compiler-runtime": "19.0.0-beta-55955c9-20241229",
     "react-dom": "^18.3.1",

diff --git a/dev/studio-e2e-testing/package.json b/dev/studio-e2e-testing/package.json
@@ -18,9 +18,9 @@
     "@sanity/color-input": "^4.0.1",
     "@sanity/google-maps-input": "^4.0.0",
     "@sanity/icons": "^3.5.7",
-    "@sanity/ui": "^2.10.17",
+    "@sanity/ui": "^2.11.0",
     "@sanity/vision": "3.68.3",
-    "babel-plugin-react-compiler": "19.0.0-beta-55955c9-20241229",
+    "babel-plugin-react-compiler": "19.0.0-beta-63e3235-20250105",
     "react": "^18.3.1",
     "react-compiler-runtime": "19.0.0-beta-55955c9-20241229",
     "react-dom": "^18.3.1",

diff --git a/dev/test-next-studio/package.json b/dev/test-next-studio/package.json
@@ -12,7 +12,7 @@
   },
   "dependencies": {
     "@sanity/vision": "workspace:*",
-    "babel-plugin-react-compiler": "19.0.0-beta-55955c9-20241229",
+    "babel-plugin-react-compiler": "19.0.0-beta-63e3235-20250105",
     "next": "15.1.3",
     "react": "rc",
     "react-dom": "rc",

diff --git a/dev/test-studio/package.json b/dev/test-studio/package.json
@@ -35,9 +35,9 @@
     "@sanity/migrate": "workspace:*",
     "@sanity/preview-url-secret": "^2.0.0",
     "@sanity/react-loader": "^1.8.3",
-    "@sanity/tsdoc": "1.0.158",
+    "@sanity/tsdoc": "1.0.163",
     "@sanity/types": "workspace:*",
-    "@sanity/ui": "^2.10.17",
+    "@sanity/ui": "^2.11.0",
     "@sanity/ui-workshop": "^1.0.0",
     "@sanity/util": "workspace:*",
     "@sanity/uuid": "^3.0.1",
@@ -66,7 +66,7 @@
   },
   "devDependencies": {
     "@million/lint": "1.0.14",
-    "babel-plugin-react-compiler": "19.0.0-beta-55955c9-20241229",
+    "babel-plugin-react-compiler": "19.0.0-beta-63e3235-20250105",
     "chokidar": "^3.6.0",
     "vite": "^5.4.11"
   }

diff --git a/examples/ecommerce-studio/package.json b/examples/ecommerce-studio/package.json
@@ -30,7 +30,7 @@
   },
   "dependencies": {
     "@sanity/cli": "3.68.3",
-    "@sanity/ui": "^2.10.17",
+    "@sanity/ui": "^2.11.0",
     "react": "^18.3.1",
     "react-barcode": "^1.4.1",
     "react-dom": "^18.3.1",

diff --git a/package.json b/package.json
@@ -114,11 +114,11 @@
     "@sanity/eslint-config-i18n": "1.0.0",
     "@sanity/eslint-config-studio": "^4.0.0",
     "@sanity/mutate": "^0.11.1",
-    "@sanity/pkg-utils": "6.12.3",
+    "@sanity/pkg-utils": "6.13.1",
     "@sanity/prettier-config": "^1.0.3",
     "@sanity/test": "0.0.1-alpha.1",
-    "@sanity/tsdoc": "1.0.158",
-    "@sanity/ui": "^2.10.17",
+    "@sanity/tsdoc": "1.0.163",
+    "@sanity/ui": "^2.11.0",
     "@sanity/uuid": "^3.0.2",
     "@types/glob": "^7.2.0",
     "@types/lodash": "^4.17.7",
@@ -145,7 +145,7 @@
     "eslint-plugin-import": "^2.30.0",
     "eslint-plugin-prettier": "^5.2.1",
     "eslint-plugin-react": "^7.36.1",
-    "eslint-plugin-react-compiler": "19.0.0-beta-55955c9-20241229",
+    "eslint-plugin-react-compiler": "19.0.0-beta-63e3235-20250105",
     "eslint-plugin-react-hooks": "^4.6.2",
     "eslint-plugin-simple-import-sort": "^12.1.1",
     "eslint-plugin-tsdoc": "^0.3.0",

diff --git a/packages/@sanity/vision/package.json b/packages/@sanity/vision/package.json
@@ -63,7 +63,7 @@
     "@rexxars/react-split-pane": "^1.0.0",
     "@sanity/color": "^3.0.0",
     "@sanity/icons": "^3.5.7",
-    "@sanity/ui": "^2.10.17",
+    "@sanity/ui": "^2.11.0",
     "@uiw/react-codemirror": "^4.11.4",
     "is-hotkey-esm": "^1.0.0",
     "json-2-csv": "^5.5.1",
@@ -85,10 +85,10 @@
     "@sanity/types": "workspace:*",
     "@sanity/util": "workspace:*",
     "@types/lodash": "^4.17.7",
-    "babel-plugin-react-compiler": "19.0.0-beta-55955c9-20241229",
+    "babel-plugin-react-compiler": "19.0.0-beta-63e3235-20250105",
     "react": "^18.3.1",
     "sanity": "workspace:*",
-    "styled-components": "^6.1.13"
+    "styled-components": "^6.1.14"
   },
   "peerDependencies": {
     "react": "^18 || ^19.0.0",

diff --git a/packages/sanity/package.json b/packages/sanity/package.json
@@ -165,7 +165,7 @@
     "@sanity/diff": "3.68.3",
     "@sanity/diff-match-patch": "^3.1.1",
     "@sanity/eventsource": "^5.0.0",
-    "@sanity/export": "^3.42.1",
+    "@sanity/export": "^3.42.2",
     "@sanity/icons": "^3.5.7",
     "@sanity/image-url": "^1.0.2",
     "@sanity/import": "^3.37.9",
@@ -177,7 +177,7 @@
     "@sanity/schema": "3.68.3",
     "@sanity/telemetry": "^0.7.7",
     "@sanity/types": "3.68.3",
-    "@sanity/ui": "^2.10.17",
+    "@sanity/ui": "^2.11.0",
     "@sanity/util": "3.68.3",
     "@sanity/uuid": "^3.0.1",
     "@sentry/react": "^8.33.0",
@@ -243,7 +243,7 @@
     "react-i18next": "14.0.2",
     "react-is": "^18.2.0",
     "react-refractor": "^2.1.6",
-    "react-rx": "^4.1.11",
+    "react-rx": "^4.1.12",
     "read-pkg-up": "^7.0.1",
     "refractor": "^3.6.0",
     "resolve-from": "^5.0.0",
@@ -273,8 +273,8 @@
     "@repo/test-config": "workspace:*",
     "@sanity/codegen": "3.68.3",
     "@sanity/generate-help-url": "^3.0.0",
-    "@sanity/pkg-utils": "6.12.3",
-    "@sanity/tsdoc": "1.0.158",
+    "@sanity/pkg-utils": "6.13.1",
+    "@sanity/tsdoc": "1.0.163",
     "@sanity/ui-workshop": "^1.2.11",
     "@sentry/types": "^8.12.0",
     "@testing-library/jest-dom": "^6.4.8",
@@ -296,13 +296,13 @@
     "@types/tar-fs": "^2.0.1",
     "@vitejs/plugin-react": "^4.3.3",
     "@vvo/tzdb": "6.137.0",
-    "babel-plugin-react-compiler": "19.0.0-beta-55955c9-20241229",
+    "babel-plugin-react-compiler": "19.0.0-beta-63e3235-20250105",
     "blob-polyfill": "^9.0.20240710",
     "date-fns-tz": "2.0.1",
     "react": "^18.3.1",
     "react-dom": "^18.3.1",
     "rxjs-etc": "^10.6.2",
-    "styled-components": "^6.1.13",
+    "styled-components": "^6.1.14",
     "swr": "2.2.5",
     "vitest": "2.1.1"
   },

diff --git a/packages/sanity/src/core/form/inputs/PortableText/PortableTextInput.tsx b/packages/sanity/src/core/form/inputs/PortableText/PortableTextInput.tsx
@@ -14,6 +14,7 @@ import {
   useEditor,
   usePortableTextEditor,
 } from '@portabletext/editor'
+import {coreBehaviors, createMarkdownBehaviors} from '@portabletext/editor/behaviors'
 import {useTelemetry} from '@sanity/telemetry/react'
 import {isKeySegment, type Path, type PortableTextBlock} from '@sanity/types'
 import {Box, Flex, Text, useToast} from '@sanity/ui'
@@ -384,6 +385,21 @@ export function PortableTextInput(props: PortableTextInputProps): ReactNode {
           <PortableTextMemberItemsProvider memberItems={portableTextMemberItems}>
             <EditorProvider
               initialConfig={{
+                behaviors: [
+                  ...coreBehaviors,
+                  ...createMarkdownBehaviors({
+                    defaultStyle: ({schema}) =>
+                      schema.styles.find((style) => style.value === 'normal')?.value,
+                    blockquoteStyle: ({schema}) =>
+                      schema.styles.find((style) => style.value === 'blockquote')?.value,
+                    headingStyle: ({schema, level}) =>
+                      schema.styles.find((style) => style.value === `h${level}`)?.value,
+                    orderedListStyle: ({schema}) =>
+                      schema.lists.find((list) => list.value === 'number')?.value,
+                    unorderedListStyle: ({schema}) =>
+                      schema.lists.find((list) => list.value === 'bullet')?.value,
+                  }),
+                ],
                 initialValue: value,
                 readOnly: readOnly || !ready,
                 keyGenerator,

diff --git a/perf/efps/package.json b/perf/efps/package.json
@@ -23,7 +23,7 @@
     "@types/serve-handler": "^6.1.4",
     "@types/yargs": "^17.0.7",
     "@vitejs/plugin-react": "^4.3.4",
-    "babel-plugin-react-compiler": "19.0.0-beta-55955c9-20241229",
+    "babel-plugin-react-compiler": "19.0.0-beta-63e3235-20250105",
     "chalk": "^4.1.2",
     "cli-table3": "^0.6.5",
     "dotenv": "^16.0.3",

diff --git a/perf/studio/package.json b/perf/studio/package.json
@@ -14,7 +14,7 @@
     "start": "sanity start --port 3300"
   },
   "dependencies": {
-    "babel-plugin-react-compiler": "19.0.0-beta-55955c9-20241229",
+    "babel-plugin-react-compiler": "19.0.0-beta-63e3235-20250105",
     "react": "^18.3.1",
     "react-compiler-runtime": "19.0.0-beta-55955c9-20241229",
     "react-dom": "^18.3.1",