Skip to content

Commit

Permalink
Merge branch 'next' into corel
Browse files Browse the repository at this point in the history
* next: (49 commits)
  fix: delays rendering the Start in Create banner until document is ready (#8020)
  fix(deps): update dependency @sanity/ui to ^2.10.9 (#8009)
  chore(deps): dedupe pnpm-lock.yaml (#8023)
  test(playwright-ct): fix issues and flake (#8016)
  feat(cli): misc copy changes (#8003)
  feat(cli): remove is-builtin-module (#6579)
  v3.67.1
  chore(deps): bump minimum requirement of @sanity/import and @sanity/export (#8012)
  chore(deps): update dependency @sanity/pkg-utils to v6.12.0 (#8010)
  fix(core): tasks UpdatedTimeAgo should be a hook (#8011)
  v3.67.0
  chore(prettier): fix unformatted files 🤖 ✨ (#8006)
  chore: reduce renovate double PR noise
  fix(deps): update dependency @sanity/ui to ^2.10.7 (#8005)
  fix(deps): update dependency @sanity/ui to ^2.10.7 (#7998)
  feat(cli): use `@vercel/frameworks` in `bootstrapRemoteTemplate` (#8001)
  feat: switch create integration to opt-out flow (#8002)
  feat: use eslint 9 for new studios (#7978)
  fix(sanity): optimise getLeafWeights to not stack overflow (#7999)
  feat(test-studio): enable `groq2024` search strategy
  ...
  • Loading branch information
bjoerge committed Dec 12, 2024
2 parents 63b2792 + fa403da commit 7198895
Show file tree
Hide file tree
Showing 163 changed files with 5,311 additions and 3,941 deletions.
6 changes: 6 additions & 0 deletions .github/renovate.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,12 @@
"pinDigest",
"replacement",
"rollback"
],
"matchPackageNames": [
"!@portabletext/editor",
"!@sanity/client",
"!@sanity/tsdoc",
"!@sanity/ui"
]
},
{
Expand Down
1 change: 1 addition & 0 deletions dev/.bin/sanity
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ const path = require('path')

require('esbuild-register/dist/node').register({
target: `node${process.version.slice(1)}`,
supported: {'dynamic-import': true},
jsx: 'automatic',
})

Expand Down
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.66.1",
"version": "3.67.1",
"private": true,
"license": "MIT",
"author": "Sanity.io <[email protected]>"
Expand Down
6 changes: 3 additions & 3 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.66.1",
"version": "3.67.1",
"private": true,
"description": "Sanity Design Studio",
"keywords": [
Expand Down Expand Up @@ -31,8 +31,8 @@
"start": "../.bin/sanity start --port 4000"
},
"dependencies": {
"@sanity/icons": "^3.5.0",
"@sanity/ui": "^2.9.1",
"@sanity/icons": "^3.5.2",
"@sanity/ui": "^2.10.9",
"react": "^18.3.1",
"react-dom": "^18.3.1",
"sanity": "workspace:*",
Expand Down
10 changes: 5 additions & 5 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.66.1",
"version": "3.67.1",
"private": true,
"scripts": {
"build": "tsc && vite build && sanity manifest extract",
"dev": "vite",
"preview": "vite preview"
},
"dependencies": {
"@sanity/ui": "^2.9.1",
"@sanity/ui": "^2.10.9",
"react": "^18.3.1",
"react-dom": "^18.3.1",
"sanity": "workspace:*",
"styled-components": "^6.1.0"
},
"devDependencies": {
"@types/react": "^18.3.13",
"@types/react-dom": "^18.3.1",
"@types/react": "^18.3.14",
"@types/react-dom": "^18.3.3",
"@vitejs/plugin-react": "^4.3.4",
"typescript": "5.7.2",
"vite": "^4.5.5"
"vite": "^5.4.11"
}
}
6 changes: 3 additions & 3 deletions 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.66.1",
"version": "3.67.1",
"private": true,
"license": "MIT",
"author": "Sanity.io <[email protected]>",
Expand All @@ -13,9 +13,9 @@
},
"dependencies": {
"@sanity/vision": "workspace:*",
"babel-plugin-react-compiler": "19.0.0-beta-df7b47d-20241124",
"babel-plugin-react-compiler": "19.0.0-beta-37ed2a7-20241206",
"react": "^18.2.0",
"react-compiler-runtime": "19.0.0-beta-df7b47d-20241124",
"react-compiler-runtime": "19.0.0-beta-37ed2a7-20241206",
"react-dom": "^18.2.0",
"react-icons": "^5.2.1",
"sanity": "workspace:*",
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.66.1",
"version": "3.67.1",
"private": true,
"license": "MIT",
"author": "Sanity.io <[email protected]>",
Expand Down
6 changes: 3 additions & 3 deletions 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.66.1",
"version": "3.67.1",
"private": true,
"license": "MIT",
"author": "Sanity.io <[email protected]>",
Expand All @@ -12,9 +12,9 @@
"start": "../.bin/sanity start --port 3337"
},
"dependencies": {
"babel-plugin-react-compiler": "19.0.0-beta-df7b47d-20241124",
"babel-plugin-react-compiler": "19.0.0-beta-37ed2a7-20241206",
"react": "^18.3.1",
"react-compiler-runtime": "19.0.0-beta-df7b47d-20241124",
"react-compiler-runtime": "19.0.0-beta-37ed2a7-20241206",
"react-dom": "^18.3.1",
"sanity": "workspace:*",
"styled-components": "^6.1.0"
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.66.1",
"version": "3.67.1",
"private": true,
"license": "MIT",
"author": "Sanity.io <[email protected]>",
Expand Down
14 changes: 8 additions & 6 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.66.1",
"version": "3.67.1",
"private": true,
"keywords": [
"sanity"
Expand All @@ -15,15 +15,17 @@
"start": "sanity preview --port 3339"
},
"dependencies": {
"@sanity/color-input": "^4.0.1",
"@sanity/google-maps-input": "^4.0.0",
"@sanity/icons": "^3.5.0",
"@sanity/ui": "^2.9.1",
"@sanity/vision": "3.66.1",
"babel-plugin-react-compiler": "19.0.0-beta-df7b47d-20241124",
"@sanity/icons": "^3.5.2",
"@sanity/ui": "^2.10.9",
"@sanity/vision": "3.67.1",
"babel-plugin-react-compiler": "19.0.0-beta-37ed2a7-20241206",
"react": "^18.3.1",
"react-compiler-runtime": "19.0.0-beta-df7b47d-20241124",
"react-compiler-runtime": "19.0.0-beta-37ed2a7-20241206",
"react-dom": "^18.3.1",
"sanity": "workspace:*",
"sanity-plugin-markdown": "^5.0.0",
"sanity-plugin-media": "^2.3.1",
"sanity-plugin-mux-input": "^2.2.1",
"sanity-test-studio": "workspace:*",
Expand Down
4 changes: 4 additions & 0 deletions dev/studio-e2e-testing/sanity.config.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
import {colorInput} from '@sanity/color-input'
import {googleMapsInput} from '@sanity/google-maps-input'
import {BookIcon} from '@sanity/icons'
import {visionTool} from '@sanity/vision'
import {defineConfig} from 'sanity'
import {structureTool} from 'sanity/structure'
import {markdownSchema} from 'sanity-plugin-markdown'
import {media} from 'sanity-plugin-media'
import {muxInput} from 'sanity-plugin-mux-input'
import {imageAssetSource} from 'sanity-test-studio/assetSources'
Expand Down Expand Up @@ -87,12 +89,14 @@ export default defineConfig({
lng: -74.1180863,
},
}),
colorInput(),
visionTool({
defaultApiVersion: '2022-08-08',
}),
// eslint-disable-next-line camelcase
muxInput({mp4_support: 'standard'}),
media(),
markdownSchema(),
],
beta: {
treeArrayEditing: {
Expand Down
2 changes: 1 addition & 1 deletion dev/test-create-integration-studio/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "test-create-integration-studio",
"version": "3.66.1",
"version": "3.67.1",
"private": true,
"license": "MIT",
"author": "Sanity.io <[email protected]>",
Expand Down
49 changes: 41 additions & 8 deletions dev/test-create-integration-studio/sanity.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,18 +5,51 @@ import {structureTool} from 'sanity/structure'

import {schemaTypes} from './schema'

export default defineConfig({
const baseConfig = defineConfig({
plugins: [structureTool(), codeInput()],
title: 'Strict',
name: 'default',
projectId: 'ppsg7ml5',
dataset: 'test',
schema: {types: schemaTypes},
})

beta: {
create: {
startInCreateEnabled: true,
fallbackStudioOrigin: 'create-integration-test.sanity.studio',
export default defineConfig([
{
...baseConfig,
title: 'Fallback origin',
name: 'fallback',
basePath: '/fallback',
beta: {
create: {
fallbackStudioOrigin: 'create-integration-test.sanity.studio',
},
},
},
})
{
...baseConfig,
title: 'No fallback origin',
name: 'no-fallback',
basePath: '/no-fallback',
},
{
...baseConfig,
title: 'Invalid fallback origin',
name: 'invalid-fallback',
basePath: '/invalid-fallback',
beta: {
create: {
fallbackStudioOrigin: 'does-not-exist',
},
},
},
{
...baseConfig,
title: 'Opt out',
name: 'opt-out',
basePath: '/opt-out',
beta: {
create: {
startInCreateEnabled: false,
},
},
},
])
26 changes: 25 additions & 1 deletion dev/test-create-integration-studio/schema.ts
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,30 @@ export const schemaTypes = [
sanityCreate: {exclude: true},
},
}),
defineType({
type: 'document',
name: 'has-initial-values',
fields: [
defineField({
name: 'title',
title: 'Documents with initial values are disabled for Create',
type: 'string',
initialValue: () =>
new Promise<string>((resolve) => {
setTimeout(() => {
resolve('Delayed initial value')
}, 5000)
}),
}),
defineField({
name: 'description',
title:
'When any value resolves, the Start in Create button disappears. This is not perfect, but "good enough" for now.',
type: 'string',
initialValue: 'Initial value',
}),
],
}),
defineType({
title: 'Documentation Article',
name: 'create-test-article',
Expand All @@ -40,7 +64,7 @@ export const schemaTypes = [
}),
defineField({
name: 'description',
title: 'Description',
title: 'Description – with initial value – Create excluded',
type: 'text',
rows: 3,
description: 'Lede and page summary.',
Expand Down
6 changes: 3 additions & 3 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.66.1",
"version": "3.67.1",
"private": true,
"license": "MIT",
"author": "Sanity.io <[email protected]>",
Expand All @@ -12,8 +12,8 @@
},
"dependencies": {
"@sanity/vision": "workspace:*",
"babel-plugin-react-compiler": "19.0.0-beta-df7b47d-20241124",
"next": "15.0.3",
"babel-plugin-react-compiler": "19.0.0-beta-37ed2a7-20241206",
"next": "15.0.4",
"react": "rc",
"react-dom": "rc",
"react-is": "rc",
Expand Down
24 changes: 13 additions & 11 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.66.1",
"version": "3.67.1",
"private": true,
"license": "MIT",
"author": "Sanity.io <[email protected]>",
Expand All @@ -16,14 +16,15 @@
"workshop:dev": "node -r esbuild-register scripts/workshop/dev.ts"
},
"dependencies": {
"@portabletext/editor": "^1.13.0",
"@portabletext/editor": "^1.15.3",
"@portabletext/react": "^3.0.0",
"@sanity/assist": "^3.0.2",
"@sanity/block-tools": "3.66.1",
"@sanity/block-tools": "3.67.1",
"@sanity/client": "^6.24.1",
"@sanity/color": "^3.0.0",
"@sanity/color-input": "^4.0.1",
"@sanity/google-maps-input": "^4.0.0",
"@sanity/icons": "^3.5.0",
"@sanity/icons": "^3.5.2",
"@sanity/image-url": "^1.0.2",
"@sanity/locale-ko-kr": "^1.0.1",
"@sanity/locale-nb-no": "^1.0.1",
Expand All @@ -34,37 +35,38 @@
"@sanity/migrate": "workspace:*",
"@sanity/preview-url-secret": "^2.0.0",
"@sanity/react-loader": "^1.10.27",
"@sanity/tsdoc": "1.0.142",
"@sanity/tsdoc": "1.0.150",
"@sanity/types": "workspace:*",
"@sanity/ui": "^2.9.1",
"@sanity/ui": "^2.10.9",
"@sanity/ui-workshop": "^1.0.0",
"@sanity/util": "workspace:*",
"@sanity/uuid": "^3.0.1",
"@sanity/vision": "workspace:*",
"@sanity/visual-editing": "2.10.4",
"@sanity/visual-editing": "2.10.6",
"@turf/helpers": "^6.0.1",
"@turf/points-within-polygon": "^5.1.5",
"@vercel/stega": "0.1.2",
"chokidar": "^3.5.3",
"globby": "^10.0.0",
"globby": "^11.1.0",
"history": "^5.3.0",
"lodash": "^4.17.21",
"qs": "^6.10.2",
"react": "^18.3.1",
"react-compiler-runtime": "19.0.0-beta-df7b47d-20241124",
"react-compiler-runtime": "19.0.0-beta-37ed2a7-20241206",
"react-dom": "^18.3.1",
"react-refractor": "^2.1.6",
"refractor": "^3.6.0",
"rxjs": "^7.8.0",
"sanity": "workspace:*",
"sanity-plugin-hotspot-array": "^2.0.0",
"sanity-plugin-markdown": "^5.0.0",
"sanity-plugin-media": "^2.3.1",
"sanity-plugin-mux-input": "^2.2.1",
"styled-components": "^6.1.11"
},
"devDependencies": {
"babel-plugin-react-compiler": "19.0.0-beta-df7b47d-20241124",
"babel-plugin-react-compiler": "19.0.0-beta-37ed2a7-20241206",
"chokidar": "^3.6.0",
"vite": "^4.5.5"
"vite": "^5.4.11"
}
}
Loading

0 comments on commit 7198895

Please sign in to comment.