Skip to content

Commit

Permalink
Merge branch 'next' into corel
Browse files Browse the repository at this point in the history
* next:
  v3.62.0
  fix: warnings on React 19 (#7654)
  fix(deps): update dependency @sanity/ui to ^2.8.10 (#7652)
  fix(deps): update dependency @sanity/ui to ^2.8.10 (#7653)
  chore(deps): update dependency @sanity/visual-editing to v2.2.2 (#7651)
  fix(core): inherit readOnly state from ancestors in copyPaste function (#7643)
  fix(deps): update dependency @sanity/mutate to ^0.10.1 (#7650)
  fix(deps): Update dev-non-major (#7649)
  fix(deps): update dependency @sanity/presentation to v1.17.3 (#7648)
  fix(deps): update dependency @portabletext/editor to ^1.1.5 (#7638)
  fix(deps): update dependency @sanity/presentation to v1.17.2 (#7647)
  fix(deps): Update dev-non-major (#7646)
  fix(deps): update dependency @sanity/presentation to v1.17.1 (#7645)
  chore(deps): update dependency @sanity/preview-url-secret to v2 (#7641)
  fix(deps): update dependency @sanity/presentation to v1.17.0 (#7640)
  fix(deps): Update dev-non-major (#7639)
  chore(cli): update help copy for deploy command (#7624)
  chore(test-studio): add asset types to structure navigation (#7631)
  • Loading branch information
bjoerge committed Oct 23, 2024
2 parents 760900e + f352db8 commit 904c978
Show file tree
Hide file tree
Showing 47 changed files with 954 additions and 586 deletions.
2 changes: 1 addition & 1 deletion dev/depcheck-test/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "depcheck-test",
"version": "3.61.0",
"version": "3.62.0",
"private": true,
"license": "MIT",
"author": "Sanity.io <[email protected]>"
Expand Down
4 changes: 2 additions & 2 deletions dev/design-studio/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "design-studio",
"version": "3.61.0",
"version": "3.62.0",
"private": true,
"description": "Sanity Design Studio",
"keywords": [
Expand Down Expand Up @@ -32,7 +32,7 @@
},
"dependencies": {
"@sanity/icons": "^3.4.0",
"@sanity/ui": "^2.8.9",
"@sanity/ui": "^2.8.10",
"react": "^18.3.1",
"react-dom": "^18.3.1",
"sanity": "workspace:*",
Expand Down
12 changes: 6 additions & 6 deletions dev/embedded-studio/package.json
Original file line number Diff line number Diff line change
@@ -1,24 +1,24 @@
{
"name": "embedded-studio",
"version": "3.61.0",
"version": "3.62.0",
"private": true,
"scripts": {
"build": "tsc && vite build && sanity manifest extract",
"dev": "vite",
"preview": "vite preview"
},
"dependencies": {
"@sanity/ui": "^2.8.9",
"@sanity/ui": "^2.8.10",
"react": "^18.3.1",
"react-dom": "^18.3.1",
"sanity": "workspace:*",
"styled-components": "^6.1.0"
},
"devDependencies": {
"@types/react": "^18.3.5",
"@types/react-dom": "^18.3.0",
"@vitejs/plugin-react": "^4.3.1",
"@types/react": "^18.3.11",
"@types/react-dom": "^18.3.1",
"@vitejs/plugin-react": "^4.3.3",
"typescript": "5.6.3",
"vite": "^4.5.3"
"vite": "^4.5.5"
}
}
2 changes: 1 addition & 1 deletion dev/page-building-studio/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "sanity-page-building-studio",
"version": "3.61.0",
"version": "3.62.0",
"private": true,
"license": "MIT",
"author": "Sanity.io <[email protected]>",
Expand Down
2 changes: 1 addition & 1 deletion dev/starter-next-studio/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "sanity-starter-next-studio",
"version": "3.61.0",
"version": "3.62.0",
"private": true,
"license": "MIT",
"author": "Sanity.io <[email protected]>",
Expand Down
2 changes: 1 addition & 1 deletion dev/starter-studio/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "sanity-starter-studio",
"version": "3.61.0",
"version": "3.62.0",
"private": true,
"license": "MIT",
"author": "Sanity.io <[email protected]>",
Expand Down
2 changes: 1 addition & 1 deletion dev/strict-studio/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "sanity-strict-studio",
"version": "3.61.0",
"version": "3.62.0",
"private": true,
"license": "MIT",
"author": "Sanity.io <[email protected]>",
Expand Down
6 changes: 3 additions & 3 deletions dev/studio-e2e-testing/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "studio-e2e-testing",
"version": "3.61.0",
"version": "3.62.0",
"private": true,
"keywords": [
"sanity"
Expand All @@ -17,8 +17,8 @@
"dependencies": {
"@sanity/google-maps-input": "^4.0.0",
"@sanity/icons": "^3.4.0",
"@sanity/ui": "^2.8.9",
"@sanity/vision": "3.61.0",
"@sanity/ui": "^2.8.10",
"@sanity/vision": "3.62.0",
"react": "^18.3.1",
"react-dom": "^18.3.1",
"sanity": "workspace:*",
Expand Down
2 changes: 1 addition & 1 deletion dev/test-next-studio/next-env.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
/// <reference types="next/image-types/global" />

// NOTE: This file should not be edited
// see https://nextjs.org/docs/basic-features/typescript for more information.
// see https://nextjs.org/docs/app/building-your-application/configuring/typescript for more information.
4 changes: 2 additions & 2 deletions dev/test-next-studio/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "sanity-test-next-studio",
"version": "3.61.0",
"version": "3.62.0",
"private": true,
"license": "MIT",
"author": "Sanity.io <[email protected]>",
Expand All @@ -13,7 +13,7 @@
"dependencies": {
"@sanity/vision": "workspace:*",
"babel-plugin-react-compiler": "0.0.0-experimental-de2cfda-20240912",
"next": "15.0.0-rc.0",
"next": "15.0.0",
"react": "19.0.0-rc-a7d1240c-20240731",
"react-dom": "19.0.0-rc-a7d1240c-20240731",
"react-is": "19.0.0-rc-a7d1240c-20240731",
Expand Down
16 changes: 8 additions & 8 deletions dev/test-studio/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "sanity-test-studio",
"version": "3.61.0",
"version": "3.62.0",
"private": true,
"license": "MIT",
"author": "Sanity.io <[email protected]>",
Expand All @@ -16,11 +16,11 @@
"workshop:dev": "node -r esbuild-register scripts/workshop/dev.ts"
},
"dependencies": {
"@portabletext/editor": "^1.1.0",
"@portabletext/editor": "^1.1.5",
"@portabletext/react": "^3.0.0",
"@sanity/assist": "^3.0.2",
"@sanity/block-tools": "3.61.0",
"@sanity/client": "^6.21.3",
"@sanity/block-tools": "3.62.0",
"@sanity/client": "^6.22.2",
"@sanity/color": "^3.0.0",
"@sanity/google-maps-input": "^4.0.0",
"@sanity/icons": "^3.4.0",
Expand All @@ -32,16 +32,16 @@
"@sanity/locale-sv-se": "^1.0.1",
"@sanity/logos": "^2.1.2",
"@sanity/migrate": "workspace:*",
"@sanity/preview-url-secret": "^1.6.1",
"@sanity/preview-url-secret": "^2.0.0",
"@sanity/react-loader": "^1.8.3",
"@sanity/tsdoc": "1.0.113",
"@sanity/types": "workspace:*",
"@sanity/ui": "^2.8.9",
"@sanity/ui": "^2.8.10",
"@sanity/ui-workshop": "^1.0.0",
"@sanity/util": "workspace:*",
"@sanity/uuid": "^3.0.1",
"@sanity/vision": "workspace:*",
"@sanity/visual-editing": "2.1.10",
"@sanity/visual-editing": "2.2.2",
"@turf/helpers": "^6.0.1",
"@turf/points-within-polygon": "^5.1.5",
"@vercel/stega": "0.1.2",
Expand All @@ -63,6 +63,6 @@
},
"devDependencies": {
"chokidar": "^3.6.0",
"vite": "^4.5.3"
"vite": "^4.5.5"
}
}
90 changes: 89 additions & 1 deletion dev/test-studio/schema/standard/objects.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,10 @@ export default defineType({
)
},
},
fieldsets: [{name: 'recursive', title: 'Recursive', options: {collapsible: true}}],
fieldsets: [
{name: 'recursive', title: 'Recursive', options: {collapsible: true}},
{name: 'readOnly', title: 'Read only', options: {collapsible: true}},
],
fields: [
{
type: 'object',
Expand Down Expand Up @@ -231,5 +234,90 @@ export default defineType({
},
],
},
{
name: 'readOnlyObject',
title: 'Read only object',
type: 'object',
fieldset: 'readOnly',
readOnly: true,
fields: [
{
name: 'selfDefinedReadOnlyField',
title: 'Read only field',
description: 'ReadOnly defined in field',
type: 'string',
readOnly: true,
},
{
name: 'inheritedReadOnlyField',
title: 'Read only field',
description: 'ReadOnly inherited from object',
type: 'string',
},
],
},
{
name: 'sections',
title: 'Sections',
type: 'array',
fieldset: 'readOnly',
of: [
{
type: 'object',
name: 'blocks',
fields: [
{
type: 'array',
name: 'blocks',
title: 'Grid',
of: [{type: 'playlistTrack'}],
},
],
},
{
type: 'object',
name: 'textBlocks',
fields: [
{
type: 'text',
name: 'text',
title: 'Text',
},
],
},
],
},
{
name: 'sectionsReadOnly',
title: 'Sections (read only)',
type: 'array',
readOnly: true,
fieldset: 'readOnly',
of: [
{
type: 'object',
name: 'blocks',
fields: [
{
type: 'array',
name: 'blocks',
title: 'Grid',
of: [{type: 'playlistTrack'}],
},
],
},
{
type: 'object',
name: 'textBlocks',
fields: [
{
type: 'text',
name: 'text',
title: 'Text',
},
],
},
],
},
],
})
6 changes: 5 additions & 1 deletion dev/test-studio/structure/resolveStructure.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import {
BinaryDocumentIcon,
CodeIcon,
CogIcon,
EarthGlobeIcon,
Expand Down Expand Up @@ -231,7 +232,7 @@ export const structure: StructureResolver = (S, {schema, documentStore, i18n}) =
options: {
filter: '_type == "author" || _type == "book"',
},
}),
}).apiVersion('2023-07-28'),
),

// A singleton not using `documentListItem`, eg no built-in preview
Expand Down Expand Up @@ -456,6 +457,9 @@ export const structure: StructureResolver = (S, {schema, documentStore, i18n}) =
]),
)
}),
S.divider(),
S.documentTypeListItem('sanity.imageAsset').icon(ImagesIcon),
S.documentTypeListItem('sanity.fileAsset').icon(BinaryDocumentIcon),
])
}

Expand Down
2 changes: 1 addition & 1 deletion examples/blog-studio/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "blog-studio",
"version": "3.61.0",
"version": "3.62.0",
"private": true,
"description": "Content studio running with schema from the blog init template",
"keywords": [
Expand Down
2 changes: 1 addition & 1 deletion examples/clean-studio/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "clean-studio",
"version": "3.61.0",
"version": "3.62.0",
"private": true,
"description": "Content studio running with schema from the clean template",
"keywords": [
Expand Down
6 changes: 3 additions & 3 deletions examples/ecommerce-studio/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "ecommerce-studio",
"version": "3.61.0",
"version": "3.62.0",
"private": true,
"description": "",
"keywords": [
Expand Down Expand Up @@ -29,8 +29,8 @@
"start": "sanity dev --port 3337"
},
"dependencies": {
"@sanity/cli": "3.61.0",
"@sanity/ui": "^2.8.9",
"@sanity/cli": "3.62.0",
"@sanity/ui": "^2.8.10",
"react": "^18.3.1",
"react-barcode": "^1.4.1",
"react-dom": "^18.3.1",
Expand Down
2 changes: 1 addition & 1 deletion examples/movies-studio/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "movies-studio",
"version": "3.61.0",
"version": "3.62.0",
"private": true,
"description": "Content studio running with schema from the moviedb init template",
"keywords": [
Expand Down
2 changes: 1 addition & 1 deletion lerna.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,5 +12,5 @@
"packages/groq",
"packages/sanity"
],
"version": "3.61.0"
"version": "3.62.0"
}
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@
"@sanity/client": "6.22.1-bundle-perspective",
"@sanity/eslint-config-i18n": "1.0.0",
"@sanity/eslint-config-studio": "^4.0.0",
"@sanity/mutate": "^0.10.0",
"@sanity/mutate": "^0.10.1",
"@sanity/pkg-utils": "6.11.4",
"@sanity/prettier-config": "^1.0.2",
"@sanity/test": "0.0.1-alpha.1",
Expand Down
2 changes: 1 addition & 1 deletion packages/@repo/dev-aliases/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@repo/dev-aliases",
"version": "3.61.0",
"version": "3.62.0",
"private": true,
"description": "Dev aliases for the sanity monorepo",
"type": "module",
Expand Down
2 changes: 1 addition & 1 deletion packages/@repo/package.bundle/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@repo/package.bundle",
"version": "3.61.0",
"version": "3.62.0",
"private": true,
"description": "Shared package bundle configuration",
"main": "./src/package.bundle.ts",
Expand Down
2 changes: 1 addition & 1 deletion packages/@repo/package.config/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@repo/package.config",
"version": "3.61.0",
"version": "3.62.0",
"private": true,
"description": "Shared @sanity/pkg-utils configuration",
"main": "./src/package.config.ts",
Expand Down
2 changes: 1 addition & 1 deletion packages/@repo/test-config/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@repo/test-config",
"version": "3.61.0",
"version": "3.62.0",
"private": true,
"description": "Test (as in unit test) config shared across packages in the sanity monorepo",
"type": "module",
Expand Down
Loading

0 comments on commit 904c978

Please sign in to comment.