@sanity/cli 3.42.2-canary.47 → 3.42.2-sdx-1339.35

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sanity/cli",
-  "version": "3.42.2-canary.47+efe8bcae60",
+  "version": "3.42.2-sdx-1339.35+b5d66f5409",
   "description": "Sanity CLI tool for managing Sanity installations, managing plugins, schemas and datasets",
   "keywords": [
     "sanity",
@@ -58,9 +58,9 @@
   "dependencies": {
     "@babel/traverse": "^7.23.5",
     "@sanity/client": "^6.18.2",
-    "@sanity/codegen": "3.42.2-canary.47+efe8bcae60",
+    "@sanity/codegen": "3.42.2-sdx-1339.35+b5d66f5409",
     "@sanity/telemetry": "^0.7.6",
-    "@sanity/util": "3.42.2-canary.47+efe8bcae60",
+    "@sanity/util": "3.42.2-sdx-1339.35+b5d66f5409",
     "chalk": "^4.1.2",
     "debug": "^4.3.4",
     "decompress": "^4.2.0",
@@ -82,7 +82,7 @@
     "@rollup/plugin-node-resolve": "^15.2.3",
     "@sanity/eslint-config-studio": "^4.0.0",
     "@sanity/generate-help-url": "^3.0.0",
-    "@sanity/types": "3.42.2-canary.47+efe8bcae60",
+    "@sanity/types": "3.42.2-sdx-1339.35+b5d66f5409",
     "@types/babel__traverse": "^7.20.5",
     "@types/configstore": "^5.0.1",
     "@types/cpx": "^1.5.2",
@@ -135,5 +135,5 @@
   "engines": {
     "node": ">=18"
   },
-  "gitHead": "efe8bcae60fd92c1624252e05811dfd85f3474c1"
+  "gitHead": "b5d66f54090988707b1bc08be39fb13b0d094168"
 }

package/src/actions/init-project/initProject.ts

@@ -48,6 +48,7 @@ import {tryGitInit} from './git'
 import {promptForDatasetName} from './promptForDatasetName'
 import {promptForAclMode, promptForDefaultConfig, promptForTypeScript} from './prompts'
 import {
+  promptForAppDir,
   promptForAppendEnv,
   promptForEmbeddedStudio,
   promptForNextTemplate,
@@ -59,7 +60,8 @@ import {
   sanityCliTemplate,
   sanityConfigTemplate,
   sanityFolder,
-  sanityStudioTemplate,
+  sanityStudioAppTemplate,
+  sanityStudioPagesTemplate,
 } from './templates/nextjs'
 
 // eslint-disable-next-line no-process-env
@@ -328,8 +330,12 @@ export default async function initSanity(
     const embeddedStudio = unattended ? true : await promptForEmbeddedStudio(prompt)
 
     if (embeddedStudio) {
-      // find source path (app or src/app)
-      const srcDir = 'app'
+      // this one is trickier on unattended, as we should probably scan for which one
+      // they're using, but they can also use both
+      const useAppDir = unattended ? false : await promptForAppDir(prompt)
+
+      // find source path (app or pages dir)
+      const srcDir = useAppDir ? 'app' : 'pages'
       let srcPath = path.join(workDir, srcDir)
 
       if (!existsSync(srcPath)) {
@@ -346,7 +352,7 @@ export default async function initSanity(
       const embeddedStudioRouteFilePath = path.join(
         srcPath,
         `${studioPath}/`,
-        `[[...tool]]/page.${fileExtension}x`,
+        useAppDir ? `[[...index]]/page.${fileExtension}x` : `[[...index]].${fileExtension}x`,
       )
 
       // this selects the correct template string based on whether the user is using the app or pages directory and
@@ -355,7 +361,7 @@ export default async function initSanity(
       // relative paths to reach the root level of the project
       await writeOrOverwrite(
         embeddedStudioRouteFilePath,
-        sanityStudioTemplate.replace(
+        (useAppDir ? sanityStudioAppTemplate : sanityStudioPagesTemplate).replace(
           ':configPath:',
           new Array(countNestedFolders(embeddedStudioRouteFilePath.slice(workDir.length)))
             .join('../')
@@ -445,11 +451,11 @@ export default async function initSanity(
     }
 
     if (chosen === 'npm') {
-      await execa('npm', ['install', 'next-sanity@9'], execOptions)
+      await execa('npm', ['install', 'next-sanity@7'], execOptions)
     } else if (chosen === 'yarn') {
-      await execa('npx', ['install-peerdeps', '--yarn', 'next-sanity@9'], execOptions)
+      await execa('npx', ['install-peerdeps', '--yarn', 'next-sanity@7'], execOptions)
     } else if (chosen === 'pnpm') {
-      await execa('pnpm', ['install', 'next-sanity@9'], execOptions)
+      await execa('pnpm', ['install', 'next-sanity@7'], execOptions)
     }
 
     print(

package/src/actions/init-project/prompts/nextjs.ts

@@ -8,6 +8,14 @@ export function promptForEmbeddedStudio(prompt: CliPrompter): Promise<string> {
   })
 }
 
+export function promptForAppDir(prompt: CliPrompter): Promise<string> {
+  return prompt.single({
+    type: 'confirm',
+    message: `Would you like to use the Next.js app directory for routes?`,
+    default: false,
+  })
+}
+
 export function promptForStudioPath(prompt: CliPrompter): Promise<string> {
   return prompt.single({
     type: 'input',

package/src/actions/init-project/templates/nextjs/index.ts

@@ -1,8 +1,6 @@
 import {blogSchemaFolder, blogSchemaJS, blogSchemaTS} from './schemaTypes/blog'
 
-export const sanityConfigTemplate = `'use client'
-
-/**
+export const sanityConfigTemplate = `/**
  * This configuration is used to for the Sanity Studio that’s mounted on the \`:route:\` route
  */
 
@@ -41,7 +39,27 @@ const dataset = process.env.NEXT_PUBLIC_SANITY_DATASET
 export default defineCliConfig({ api: { projectId, dataset } })
 `
 
-export const sanityStudioTemplate = `/**
+export const sanityStudioPagesTemplate = `import Head from 'next/head'
+import { NextStudio } from 'next-sanity/studio'
+import { metadata } from 'next-sanity/studio/metadata'
+import config from ':configPath:'
+
+export default function StudioPage() {
+  return (
+    <>
+      <Head>
+        {Object.entries(metadata).map(([key, value]) => (
+          <meta key={key} name={key} content={value} />
+        ))}
+      </Head>
+      <NextStudio config={config} />
+    </>
+  )
+}`
+
+export const sanityStudioAppTemplate = `'use client'
+
+/**
  * This route is responsible for the built-in authoring environment using Sanity Studio.
  * All routes under your studio path is handled by this file using Next.js' catch-all routes:
  * https://nextjs.org/docs/routing/dynamic-routes#catch-all-routes
@@ -53,14 +71,12 @@ export const sanityStudioTemplate = `/**
 import { NextStudio } from 'next-sanity/studio'
 import config from ':configPath:'
 
-export const dynamic = 'force-static'
-
-export { metadata, viewport } from 'next-sanity/studio'
-
 export default function StudioPage() {
   return <NextStudio config={config} />
 }`
 
+export const sanityStudioAppLayoutTemplate = `export {metadata} from 'next-sanity/studio'`
+
 // Format today's date like YYYY-MM-DD
 const envTS = `export const apiVersion =
   process.env.NEXT_PUBLIC_SANITY_API_VERSION || '${new Date().toISOString().split('T')[0]}'
@@ -111,11 +127,10 @@ const client = `import { createClient } from 'next-sanity'
 import { apiVersion, dataset, projectId, useCdn } from '../env'
 
 export const client = createClient({
-  projectId,
-  dataset,
   apiVersion,
+  dataset,
+  projectId,
   useCdn,
-  perspective: 'published',
 })
 `