Skip to content

Commit 1fe9d31

Browse files
bjoergebjoerge
committed
Merge branch 'next' into corel
* next: fix(deps): upgrade `@sanity/ui` to `2.8.22` (#7783) fix(deps): Update dev-non-major (#7770) fix(deps): update dependency @portabletext/editor to ^1.6.1 (#7778) fix(deps): update dependency @sanity/presentation to v1.17.10 (#7767) fix(deps): update dependency @sanity/mutate to ^0.10.2 (#7781) fix(deps): update dependency @sanity/ui to ^2.8.21 (#7779) fix(deps): update dependency @sanity/client to ^6.22.3 (#7766) feat: simplify search strategy configuration (#7765) chore: update Studio teams in CODEOWNERS (#7780) chore(deps): update typescript-tooling (#7762) fix(deps): update dependency @portabletext/editor to ^1.5.5 (#7763) fix(deps): update dependency react-rx to ^4.1.4 (#7768) chore(deps): lock file maintenance (#7757)
2 parents a634563 + 23ca786 commit 1fe9d31

File tree

39 files changed

+867
-638
lines changed

39 files changed

+867
-638
lines changed

‎.github/CODEOWNERS

+27-76
Original file line numberDiff line numberDiff line change
@@ -1,46 +1,12 @@
1-
# By default, assign the studio developer experience team.
1+
# By default, assign the Studio team.
22
# Later matching rules will take precedence.
3-
* @sanity-io/studio-dx
3+
* @sanity-io/studio
44

55
# For areas of responsibility, assign the specific team
66
# that is responsible. It is possible to assign to individuals,
77
# however it is preferable that a team is responsible for large
88
# areas to improve maintainablitly and availability
99

10-
# -- CLI --
11-
/packages/@sanity/cli/ @sanity-io/studio-dx
12-
13-
# -- Form --
14-
/packages/sanity/src/core/form/ @sanity-io/studio-dx
15-
16-
# -- Preview --
17-
/packages/sanity/src/core/preview/ @sanity-io/studio-dx
18-
19-
# -- PTE --
20-
/packages/sanity/src/core/field/types/portableText/ @sanity-io/studio-ex
21-
/packages/sanity/src/core/form/inputs/PortableText/ @sanity-io/studio-ex
22-
/packages/sanity/src/core/form/types/blockProps.ts @sanity-io/studio-ex
23-
/packages/@sanity/types/src/schema/definition/type/block.ts @sanity-io/studio-ex
24-
25-
# -- Block tools --
26-
/packages/@sanity/block-tools/ @sanity-io/studio-ex
27-
28-
# -- Playwright Component tests --
29-
/packages/sanity/playwright-ct @sanity-io/studio-ex
30-
31-
# -- Search --
32-
/packages/sanity/src/core/search/ @sanity-io/studio-ex
33-
34-
# -- DocumentList --
35-
packages/sanity/src/structure/panes/documentList/sheetList @sanity-io/studio-ex
36-
37-
# -- Theming (legacy) --
38-
/packages/sanity/src/core/theme/ @sanity-io/studio-ex
39-
40-
# -- Visual components --
41-
/packages/sanity/src/core/studio/components/ @sanity-io/studio-ex
42-
/packages/sanity/src/ui-components/ @sanity-io/studio-ex
43-
4410
# -- Others --
4511

4612
# Shopify templates
@@ -50,21 +16,6 @@ packages/sanity/src/structure/panes/documentList/sheetList @sanity-io/studio-ex
5016
# Telemetry definitions
5117
*.telemetry.ts @sanity-io/data-eng
5218

53-
# -- Plugins --
54-
55-
# -- Tasks --
56-
/packages/sanity/src/core/tasks/ @sanity-io/studio-ex
57-
58-
# -- Comments --
59-
/packages/sanity/src/core/comments/ @sanity-io/studio-ex
60-
61-
# -- Scheduled Publishing --
62-
/packages/sanity/src/core/scheduledPublishing/ @sanity-io/studio-ex
63-
64-
# -- Upsell UI --
65-
packages/sanity/src/core/studio/upsell/ @sanity-io/studio-ex
66-
67-
6819
# Code and typegeneration
6920
/packages/@sanity/codegen/ @sanity-io/content-lake-dx
7021
/packages/@sanity/cli/src/actions/typegen @sanity-io/content-lake-dx
@@ -73,28 +24,28 @@ packages/sanity/src/core/studio/upsell/ @sanity-io/studio-ex
7324

7425
# Internals used by @sanity/presentation
7526
# See https://github.com/sanity-io/visual-editing/blob/main/packages/presentation/src/internals.ts for exactly which exports
76-
/packages/sanity/src/_singletons/structure/components/paneRouter/PaneRouterContext.tsx @sanity-io/ecosystem @sanity-io/studio-dx
77-
/packages/sanity/src/core/comments/context/intent/CommentsIntentProvider.tsx @sanity-io/ecosystem @sanity-io/studio-ex
78-
/packages/sanity/src/core/comments/types.ts @sanity-io/ecosystem @sanity-io/studio-ex
79-
/packages/sanity/src/core/config/document/fieldActions/define.ts @sanity-io/ecosystem @sanity-io/studio-dx
80-
/packages/sanity/src/core/config/document/fieldActions/types.ts @sanity-io/ecosystem @sanity-io/studio-dx
81-
/packages/sanity/src/core/field/paths/helpers.ts @sanity-io/ecosystem @sanity-io/studio-dx
82-
/packages/sanity/src/core/hooks/useEditState.ts @sanity-io/ecosystem @sanity-io/studio-dx
83-
/packages/sanity/src/core/preview/components/Preview.tsx @sanity-io/ecosystem @sanity-io/studio-dx
84-
/packages/sanity/src/core/store/_legacy/datastores.ts @sanity-io/ecosystem @sanity-io/studio-dx
85-
/packages/sanity/src/core/store/_legacy/document/document-store.ts @sanity-io/ecosystem @sanity-io/studio-dx
86-
/packages/sanity/src/core/studio/activeWorkspaceMatcher/useActiveWorkspace.ts @sanity-io/ecosystem @sanity-io/studio-dx
87-
/packages/sanity/src/core/studio/workspace.tsx @sanity-io/ecosystem @sanity-io/studio-dx
88-
/packages/sanity/src/core/util/draftUtils.ts @sanity-io/ecosystem @sanity-io/studio-dx
89-
/packages/sanity/src/core/util/isRecord.ts @sanity-io/ecosystem @sanity-io/studio-dx
90-
/packages/sanity/src/core/util/useUnique.ts @sanity-io/ecosystem @sanity-io/studio-dx
91-
/packages/sanity/src/router/utils/jsonParamsEncoding.ts @sanity-io/ecosystem @sanity-io/studio-dx
92-
/packages/sanity/src/structure/components/pane/PaneLayout.tsx @sanity-io/ecosystem @sanity-io/studio-dx
93-
/packages/sanity/src/structure/components/paneRouter/types.ts @sanity-io/ecosystem @sanity-io/studio-dx
94-
/packages/sanity/src/structure/panes/document/DocumentPane.tsx @sanity-io/ecosystem @sanity-io/studio-dx
95-
/packages/sanity/src/structure/panes/document/useDocumentPane.tsx @sanity-io/ecosystem @sanity-io/studio-dx
96-
/packages/sanity/src/structure/panes/documentList/index.ts @sanity-io/ecosystem @sanity-io/studio-dx
97-
/packages/sanity/src/structure/panes/documentList/pane.ts @sanity-io/ecosystem @sanity-io/studio-dx
98-
/packages/sanity/src/structure/panes/documentList/PaneContainer.tsx @sanity-io/ecosystem @sanity-io/studio-dx
99-
/packages/sanity/src/structure/StructureToolProvider.tsx @sanity-io/ecosystem @sanity-io/studio-dx
100-
/packages/sanity/src/structure/types.ts @sanity-io/ecosystem @sanity-io/studio-dx
27+
/packages/sanity/src/_singletons/structure/components/paneRouter/PaneRouterContext.tsx @sanity-io/ecosystem @sanity-io/studio
28+
/packages/sanity/src/core/comments/context/intent/CommentsIntentProvider.tsx @sanity-io/ecosystem @sanity-io/studio
29+
/packages/sanity/src/core/comments/types.ts @sanity-io/ecosystem @sanity-io/studio
30+
/packages/sanity/src/core/config/document/fieldActions/define.ts @sanity-io/ecosystem @sanity-io/studio
31+
/packages/sanity/src/core/config/document/fieldActions/types.ts @sanity-io/ecosystem @sanity-io/studio
32+
/packages/sanity/src/core/field/paths/helpers.ts @sanity-io/ecosystem @sanity-io/studio
33+
/packages/sanity/src/core/hooks/useEditState.ts @sanity-io/ecosystem @sanity-io/studio
34+
/packages/sanity/src/core/preview/components/Preview.tsx @sanity-io/ecosystem @sanity-io/studio
35+
/packages/sanity/src/core/store/_legacy/datastores.ts @sanity-io/ecosystem @sanity-io/studio
36+
/packages/sanity/src/core/store/_legacy/document/document-store.ts @sanity-io/ecosystem @sanity-io/studio
37+
/packages/sanity/src/core/studio/activeWorkspaceMatcher/useActiveWorkspace.ts @sanity-io/ecosystem @sanity-io/studio
38+
/packages/sanity/src/core/studio/workspace.tsx @sanity-io/ecosystem @sanity-io/studio
39+
/packages/sanity/src/core/util/draftUtils.ts @sanity-io/ecosystem @sanity-io/studio
40+
/packages/sanity/src/core/util/isRecord.ts @sanity-io/ecosystem @sanity-io/studio
41+
/packages/sanity/src/core/util/useUnique.ts @sanity-io/ecosystem @sanity-io/studio
42+
/packages/sanity/src/router/utils/jsonParamsEncoding.ts @sanity-io/ecosystem @sanity-io/studio
43+
/packages/sanity/src/structure/components/pane/PaneLayout.tsx @sanity-io/ecosystem @sanity-io/studio
44+
/packages/sanity/src/structure/components/paneRouter/types.ts @sanity-io/ecosystem @sanity-io/studio
45+
/packages/sanity/src/structure/panes/document/DocumentPane.tsx @sanity-io/ecosystem @sanity-io/studio
46+
/packages/sanity/src/structure/panes/document/useDocumentPane.tsx @sanity-io/ecosystem @sanity-io/studio
47+
/packages/sanity/src/structure/panes/documentList/index.ts @sanity-io/ecosystem @sanity-io/studio
48+
/packages/sanity/src/structure/panes/documentList/pane.ts @sanity-io/ecosystem @sanity-io/studio
49+
/packages/sanity/src/structure/panes/documentList/PaneContainer.tsx @sanity-io/ecosystem @sanity-io/studio
50+
/packages/sanity/src/structure/StructureToolProvider.tsx @sanity-io/ecosystem @sanity-io/studio
51+
/packages/sanity/src/structure/types.ts @sanity-io/ecosystem @sanity-io/studio

‎dev/design-studio/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
},
3333
"dependencies": {
3434
"@sanity/icons": "^3.4.0",
35-
"@sanity/ui": "^2.8.19",
35+
"@sanity/ui": "^2.8.22",
3636
"react": "^18.3.1",
3737
"react-dom": "^18.3.1",
3838
"sanity": "workspace:*",

‎dev/embedded-studio/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
"preview": "vite preview"
99
},
1010
"dependencies": {
11-
"@sanity/ui": "^2.8.19",
11+
"@sanity/ui": "^2.8.22",
1212
"react": "^18.3.1",
1313
"react-dom": "^18.3.1",
1414
"sanity": "workspace:*",

‎dev/studio-e2e-testing/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
"dependencies": {
1818
"@sanity/google-maps-input": "^4.0.0",
1919
"@sanity/icons": "^3.4.0",
20-
"@sanity/ui": "^2.8.19",
20+
"@sanity/ui": "^2.8.22",
2121
"@sanity/vision": "3.63.0",
2222
"react": "^18.3.1",
2323
"react-dom": "^18.3.1",

‎dev/test-next-studio/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
"dependencies": {
1414
"@sanity/vision": "workspace:*",
1515
"babel-plugin-react-compiler": "beta",
16-
"next": "15.0.2",
16+
"next": "15.0.3",
1717
"react": "19.0.0-rc-a7d1240c-20240731",
1818
"react-dom": "19.0.0-rc-a7d1240c-20240731",
1919
"react-is": "19.0.0-rc-a7d1240c-20240731",

‎dev/test-studio/package.json

+12-7
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,11 @@
1616
"workshop:dev": "node -r esbuild-register scripts/workshop/dev.ts"
1717
},
1818
"dependencies": {
19-
"@portabletext/editor": "^1.5.4",
19+
"@portabletext/editor": "^1.6.1",
2020
"@portabletext/react": "^3.0.0",
2121
"@sanity/assist": "^3.0.2",
2222
"@sanity/block-tools": "3.63.0",
23-
"@sanity/client": "^6.22.2",
23+
"@sanity/client": "^6.22.3",
2424
"@sanity/color": "^3.0.0",
2525
"@sanity/google-maps-input": "^4.0.0",
2626
"@sanity/icons": "^3.4.0",
@@ -32,16 +32,16 @@
3232
"@sanity/locale-sv-se": "^1.0.1",
3333
"@sanity/logos": "^2.1.2",
3434
"@sanity/migrate": "workspace:*",
35-
"@sanity/preview-url-secret": "^2.0.1-release.4",
36-
"@sanity/react-loader": "^1.10.15-release.4",
37-
"@sanity/tsdoc": "1.0.122",
35+
"@sanity/preview-url-secret": "^2.0.0",
36+
"@sanity/react-loader": "^1.8.3",
37+
"@sanity/tsdoc": "1.0.126",
3838
"@sanity/types": "workspace:*",
39-
"@sanity/ui": "^2.8.19",
39+
"@sanity/ui": "^2.8.22",
4040
"@sanity/ui-workshop": "^1.0.0",
4141
"@sanity/util": "workspace:*",
4242
"@sanity/uuid": "^3.0.1",
4343
"@sanity/vision": "workspace:*",
44-
"@sanity/visual-editing": "2.4.3-release.4",
44+
"@sanity/visual-editing": "2.5.2",
4545
"@turf/helpers": "^6.0.1",
4646
"@turf/points-within-polygon": "^5.1.5",
4747
"@vercel/stega": "0.1.2",
@@ -64,5 +64,10 @@
6464
"devDependencies": {
6565
"chokidar": "^3.6.0",
6666
"vite": "^4.5.5"
67+
},
68+
"overrides": {
69+
"@sanity/preview-url-secret": "^2.0.1-release.4",
70+
"@sanity/react-loader": "^1.10.15-release.4",
71+
"@sanity/visual-editing": "2.4.3-release.4"
6772
}
6873
}

‎examples/ecommerce-studio/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
},
3131
"dependencies": {
3232
"@sanity/cli": "3.63.0",
33-
"@sanity/ui": "^2.8.19",
33+
"@sanity/ui": "^2.8.22",
3434
"react": "^18.3.1",
3535
"react-barcode": "^1.4.1",
3636
"react-dom": "^18.3.1",

‎package.json

+5-5
Original file line numberDiff line numberDiff line change
@@ -107,15 +107,15 @@
107107
"@repo/package.config": "workspace:*",
108108
"@repo/test-config": "workspace:*",
109109
"@repo/tsconfig": "workspace:*",
110-
"@sanity/client": "6.22.2-bundle-perspective-2",
110+
"@sanity/client": "^6.22.3",
111111
"@sanity/eslint-config-i18n": "1.0.0",
112112
"@sanity/eslint-config-studio": "^4.0.0",
113-
"@sanity/mutate": "^0.10.1",
114-
"@sanity/pkg-utils": "6.11.8",
113+
"@sanity/mutate": "^0.10.2",
114+
"@sanity/pkg-utils": "6.11.9",
115115
"@sanity/prettier-config": "^1.0.3",
116116
"@sanity/test": "0.0.1-alpha.1",
117-
"@sanity/tsdoc": "1.0.122",
118-
"@sanity/ui": "2.10.0-corel.0",
117+
"@sanity/tsdoc": "1.0.126",
118+
"@sanity/ui": "^2.8.22",
119119
"@sanity/uuid": "^3.0.2",
120120
"@types/glob": "^7.2.0",
121121
"@types/lodash": "^4.17.7",

‎packages/@sanity/cli/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@
5757
},
5858
"dependencies": {
5959
"@babel/traverse": "^7.23.5",
60-
"@sanity/client": "^6.22.2",
60+
"@sanity/client": "^6.22.3",
6161
"@sanity/codegen": "3.63.0",
6262
"@sanity/telemetry": "^0.7.7",
6363
"@sanity/util": "3.63.0",

‎packages/@sanity/migrate/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,8 @@
5050
"watch": "pkg-utils watch"
5151
},
5252
"dependencies": {
53-
"@sanity/client": "^6.22.2",
54-
"@sanity/mutate": "^0.10.1",
53+
"@sanity/client": "^6.22.3",
54+
"@sanity/mutate": "^0.10.2",
5555
"@sanity/types": "3.63.0",
5656
"@sanity/util": "3.63.0",
5757
"arrify": "^2.0.1",

‎packages/@sanity/types/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
"watch": "pkg-utils watch"
5050
},
5151
"dependencies": {
52-
"@sanity/client": "^6.22.2",
52+
"@sanity/client": "^6.22.3",
5353
"@types/react": "^18.3.5"
5454
},
5555
"devDependencies": {

‎packages/@sanity/types/src/index.ts

+1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ export * from './paths'
88
export * from './portableText'
99
export * from './reference'
1010
export * from './schema'
11+
export * from './search'
1112
export * from './slug'
1213
export * from './transactionLog'
1314
export * from './upload'

‎packages/@sanity/types/src/reference/types.ts

+2-1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ import {type SanityClient} from '@sanity/client'
33
import {type SanityDocument} from '../documents'
44
import {type Path} from '../paths'
55
import {type BaseSchemaTypeOptions} from '../schema'
6+
import {type SearchStrategy} from '../search/types'
67

78
/** @public */
89
export interface Reference {
@@ -28,7 +29,7 @@ export type ReferenceFilterSearchOptions = {
2829
params?: Record<string, unknown>
2930
tag?: string
3031
maxFieldDepth?: number
31-
enableLegacySearch?: boolean
32+
strategy?: SearchStrategy
3233
}
3334

3435
/** @public */

‎packages/@sanity/types/src/search/asserters.ts

+10
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
import {searchStrategies, type SearchStrategy} from './types'
2+
3+
/**
4+
* @internal
5+
*/
6+
export function isSearchStrategy(
7+
maybeSearchStrategy: unknown,
8+
): maybeSearchStrategy is SearchStrategy {
9+
return searchStrategies.includes(maybeSearchStrategy as SearchStrategy)
10+
}

‎packages/@sanity/types/src/search/index.ts

+2
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
export * from './asserters'
2+
export * from './types'

‎packages/@sanity/types/src/search/types.ts

+9
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
/**
2+
* @public
3+
*/
4+
export const searchStrategies = ['groqLegacy', 'textSearch'] as const
5+
6+
/**
7+
* @public
8+
*/
9+
export type SearchStrategy = (typeof searchStrategies)[number]

‎packages/@sanity/util/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@
121121
"watch": "pkg-utils watch"
122122
},
123123
"dependencies": {
124-
"@sanity/client": "^6.22.2",
124+
"@sanity/client": "^6.22.3",
125125
"@sanity/types": "3.63.0",
126126
"get-random-values-esm": "1.0.2",
127127
"moment": "^2.30.1",

‎packages/@sanity/vision/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@
6363
"@rexxars/react-split-pane": "^0.1.93",
6464
"@sanity/color": "^3.0.0",
6565
"@sanity/icons": "^3.4.0",
66-
"@sanity/ui": "^2.8.19",
66+
"@sanity/ui": "^2.8.22",
6767
"@uiw/react-codemirror": "^4.11.4",
6868
"is-hotkey-esm": "^1.0.0",
6969
"json-2-csv": "^5.5.1",
@@ -75,7 +75,7 @@
7575
"@repo/package.config": "workspace:*",
7676
"@sanity/block-tools": "workspace:*",
7777
"@sanity/cli": "workspace:*",
78-
"@sanity/client": "^6.22.2",
78+
"@sanity/client": "^6.22.3",
7979
"@sanity/codegen": "workspace:*",
8080
"@sanity/diff": "workspace:*",
8181
"@sanity/migrate": "workspace:*",

0 commit comments

Comments
 (0)