Skip to content

Commit

Permalink
Merge branch 'next' into corel
Browse files Browse the repository at this point in the history
* next:
  feat: adds support for Create-Studio integration (#7635)
  fix(deps): Update dev-non-major (#7671)
  fix(deps): update dependency @sanity/insert-menu to v1.0.10 (#7668)
  fix(deps): update dependency @sanity/presentation to v1.17.6 (#7669)
  v3.62.2
  fix(deps): Update dev-non-major (#7663)
  fix(deps): update dependency @sanity/presentation to v1.17.4 (#7662)
  fix(deps): Update dev-non-major (#7661)
  v3.62.1
  feat(cli): add warning and docs for react-19 and Next.Js combined (#7660)
  • Loading branch information
bjoerge committed Oct 28, 2024
2 parents bb9a972 + 12cb46b commit 68a30f1
Show file tree
Hide file tree
Showing 106 changed files with 2,915 additions and 323 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.62.0",
"version": "3.62.2",
"private": true,
"license": "MIT",
"author": "Sanity.io <[email protected]>"
Expand Down
2 changes: 1 addition & 1 deletion dev/design-studio/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "design-studio",
"version": "3.62.0",
"version": "3.62.2",
"private": true,
"description": "Sanity Design Studio",
"keywords": [
Expand Down
4 changes: 2 additions & 2 deletions dev/embedded-studio/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "embedded-studio",
"version": "3.62.0",
"version": "3.62.2",
"private": true,
"scripts": {
"build": "tsc && vite build && sanity manifest extract",
Expand All @@ -15,7 +15,7 @@
"styled-components": "^6.1.0"
},
"devDependencies": {
"@types/react": "^18.3.11",
"@types/react": "^18.3.12",
"@types/react-dom": "^18.3.1",
"@vitejs/plugin-react": "^4.3.3",
"typescript": "5.6.3",
Expand Down
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.62.0",
"version": "3.62.2",
"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.62.0",
"version": "3.62.2",
"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.62.0",
"version": "3.62.2",
"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.62.0",
"version": "3.62.2",
"private": true,
"license": "MIT",
"author": "Sanity.io <[email protected]>",
Expand Down
4 changes: 2 additions & 2 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.62.0",
"version": "3.62.2",
"private": true,
"keywords": [
"sanity"
Expand All @@ -18,7 +18,7 @@
"@sanity/google-maps-input": "^4.0.0",
"@sanity/icons": "^3.4.0",
"@sanity/ui": "^2.8.10",
"@sanity/vision": "3.62.0",
"@sanity/vision": "3.62.2",
"react": "^18.3.1",
"react-dom": "^18.3.1",
"sanity": "workspace:*",
Expand Down
3 changes: 3 additions & 0 deletions dev/test-create-integration-studio/.depcheckignore.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"ignore": ["styled-components", "react", "react-dom", "sanity"]
}
1 change: 1 addition & 0 deletions dev/test-create-integration-studio/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
/dist
22 changes: 22 additions & 0 deletions dev/test-create-integration-studio/package.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
{
"name": "test-create-integration-studio",
"version": "3.61.0",
"private": true,
"license": "MIT",
"author": "Sanity.io <[email protected]>",
"scripts": {
"build": "../.bin/sanity build",
"clean": "rimraf .sanity dist",
"deploy": "npx sanity deploy",
"dev": "../.bin/sanity dev",
"lint": "eslint .",
"start": "../.bin/sanity start"
},
"dependencies": {
"@sanity/code-input": "^4.1.4",
"react": "^18.3.1",
"react-dom": "^18.3.1",
"sanity": "workspace:*",
"styled-components": "^6.1.0"
}
}
11 changes: 11 additions & 0 deletions dev/test-create-integration-studio/sanity.cli.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
import {defineCliConfig} from 'sanity/cli'

export default defineCliConfig({
api: {
projectId: 'ppsg7ml5',
dataset: 'test',
},

studioHost: 'create-integration-test',
autoUpdates: false,
})
22 changes: 22 additions & 0 deletions dev/test-create-integration-studio/sanity.config.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
// eslint-disable-next-line import/no-extraneous-dependencies
import {codeInput} from '@sanity/code-input'
import {defineConfig} from 'sanity'
import {structureTool} from 'sanity/structure'

import {schemaTypes} from './schema'

export default 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',
},
},
})
Loading

0 comments on commit 68a30f1

Please sign in to comment.