fix: improve bundler output

packages/next-sanity/package.config.ts

@@ -1,20 +1,21 @@
+import path from 'node:path'
 import {defineConfig} from '@sanity/pkg-utils'
 
 const MODULE_PATHS_WHICH_USE_CLIENT_DIRECTIVE_SHOULD_BE_ADDED = [
-  'NextStudio.tsx',
-  'VisualEditing.tsx',
-  'imageLoader.ts',
+  path.join('src', 'image', 'index.ts'),
+  path.join('src', 'studio', 'client-component', 'index.ts'),
+  path.join('src', 'visual-editing', 'client-component', 'index.ts'),
 ]
 
-const MODULE_PATHS_WHICH_USE_SERVER_DIRECTIVE_SHOULD_BE_ADDED = ['actions.ts']
+const MODULE_PATHS_WHICH_USE_SERVER_DIRECTIVE_SHOULD_BE_ADDED = [
+  path.join('src', 'visual-editing', 'server-actions', 'index.ts'),
+]
 
 export default defineConfig({
   tsconfig: 'tsconfig.build.json',
   minify: true,
   rollup: {
     output: {
-      preserveModules: true,
-      preserveModulesRoot: 'src',
       banner: (chunkInfo) => {
         if (
           MODULE_PATHS_WHICH_USE_CLIENT_DIRECTIVE_SHOULD_BE_ADDED.find((modulePath) =>

packages/next-sanity/package.json

@@ -33,15 +33,15 @@
     },
     "./image": {
       "source": "./src/image/index.ts",
-      "import": "./dist/image/index.js",
-      "require": "./dist/image/index.cjs",
-      "default": "./dist/image/index.js"
+      "import": "./dist/image.js",
+      "require": "./dist/image.cjs",
+      "default": "./dist/image.js"
     },
     "./preview": {
       "source": "./src/preview/index.ts",
-      "import": "./dist/preview/index.js",
-      "require": "./dist/preview/index.cjs",
-      "default": "./dist/preview/index.js"
+      "import": "./dist/preview.js",
+      "require": "./dist/preview.cjs",
+      "default": "./dist/preview.js"
     },
     "./preview/live-query": {
       "source": "./src/preview/LiveQuery/index.ts",
@@ -51,9 +51,27 @@
     },
     "./studio": {
       "source": "./src/studio/index.ts",
-      "import": "./dist/studio/index.js",
-      "require": "./dist/studio/index.cjs",
-      "default": "./dist/studio/index.js"
+      "import": "./dist/studio.js",
+      "require": "./dist/studio.cjs",
+      "default": "./dist/studio.js"
+    },
+    "./studio/client-component": {
+      "source": "./src/studio/client-component/index.ts",
+      "import": "./dist/studio/client-component.js",
+      "require": "./dist/studio/client-component.cjs",
+      "default": "./dist/studio/client-component.js"
+    },
+    "./visual-editing/client-component": {
+      "source": "./src/visual-editing/client-component/index.ts",
+      "import": "./dist/visual-editing/client-component.js",
+      "require": "./dist/visual-editing/client-component.cjs",
+      "default": "./dist/visual-editing/client-component.js"
+    },
+    "./visual-editing/server-actions": {
+      "source": "./src/visual-editing/server-actions/index.ts",
+      "import": "./dist/visual-editing/server-actions.js",
+      "require": "./dist/visual-editing/server-actions.cjs",
+      "default": "./dist/visual-editing/server-actions.js"
     },
     "./webhook": {
       "source": "./src/webhook/index.ts",
@@ -69,16 +87,25 @@
   "typesVersions": {
     "*": {
       "image": [
-        "./dist/image/index.d.ts"
+        "./dist/image.d.ts"
       ],
       "preview": [
-        "./dist/preview/index.d.ts"
+        "./dist/preview.d.ts"
       ],
       "preview/live-query": [
         "./dist/preview/live-query.d.ts"
       ],
       "studio": [
-        "./dist/studio/index.d.ts"
+        "./dist/studio.d.ts"
+      ],
+      "studio/client-component": [
+        "./dist/studio/client-component.d.ts"
+      ],
+      "visual-editing/client-component": [
+        "./dist/visual-editing/client-component.d.ts"
+      ],
+      "visual-editing/server-actions": [
+        "./dist/visual-editing/server-actions.d.ts"
       ],
       "webhook": [
         "./dist/webhook.d.ts"

packages/next-sanity/src/image/Image.tsx

@@ -1,4 +1,4 @@
-import NextImage, {ImageProps as NextImageProps} from 'next/image'
+import NextImage, {type ImageProps as NextImageProps} from 'next/image'
 
 import {imageLoader} from './imageLoader'
 

packages/next-sanity/src/image/imageLoader.ts

@@ -1,5 +1,3 @@
-'use client'
-
 import type {ImageLoader} from 'next/image'
 
 /**

packages/next-sanity/src/studio/NextStudio.tsx → packages/next-sanity/src/studio/client-component/NextStudio.tsx

@@ -1,11 +1,9 @@
-'use client'
-
 import {memo, useMemo} from 'react'
 import {Studio, type StudioProps} from 'sanity'
 
 import {createHashHistoryForStudio} from './createHashHistoryForStudio'
-import {NextStudioLayout} from './NextStudioLayout'
-import {NextStudioNoScript} from './NextStudioNoScript'
+import {NextStudioLayout} from '../NextStudioLayout'
+import {NextStudioNoScript} from '../NextStudioNoScript'
 import {StyledComponentsRegistry} from './registry'
 import {useIsMounted} from './useIsMounted'
 

packages/next-sanity/src/studio/client-component/index.ts

@@ -0,0 +1 @@
+export * from './NextStudio'

packages/next-sanity/src/studio/index.ts

@@ -1,4 +1,5 @@
 export {metadata, viewport} from './head'
-export * from './NextStudio'
+export {NextStudio} from 'next-sanity/studio/client-component'
+export type {NextStudioProps} from 'next-sanity/studio/client-component'
 export * from './NextStudioLayout'
 export * from './NextStudioNoScript'

packages/next-sanity/src/visual-editing/VisualEditing.tsx → packages/next-sanity/src/visual-editing/client-component/index.ts

@@ -1,5 +1,3 @@
-'use client'
-
 import {
   enableVisualEditing,
   type HistoryAdapterNavigate,
@@ -8,7 +6,7 @@ import {
 import {usePathname, useRouter, useSearchParams} from 'next/navigation.js'
 import {useEffect, useRef, useState} from 'react'
 
-import {revalidateRootLayout} from './actions'
+import {revalidateRootLayout} from 'next-sanity/visual-editing/server-actions'
 
 /**
  * @public

packages/next-sanity/src/visual-editing/index.tsx

@@ -1,8 +1,8 @@
 import {lazy, Suspense} from 'react'
 
-import type {VisualEditingProps} from './VisualEditing'
+import type {VisualEditingProps} from 'next-sanity/visual-editing/client-component'
 
-const VisualEditingComponent = lazy(() => import('./VisualEditing'))
+const VisualEditingComponent = lazy(() => import('next-sanity/visual-editing/client-component'))
 
 /**
  * @public
@@ -15,7 +15,7 @@ export function VisualEditing(props: VisualEditingProps): React.ReactElement {
   )
 }
 
-export type {VisualEditingProps} from './VisualEditing'
+export type {VisualEditingProps} from 'next-sanity/visual-editing/client-component'
 export {
   type CreateDataAttribute,
   createDataAttribute,

packages/next-sanity/src/visual-editing/actions.ts → packages/next-sanity/src/visual-editing/server-actions/index.ts

@@ -1,7 +1,3 @@
-'use server'
-/**
- * The code in this file will be ported to `next-sanity`
- */
 import {revalidatePath} from 'next/cache.js'
 import {draftMode} from 'next/headers.js'
 

packages/next-sanity/tsconfig.base.json

@@ -1,25 +1,20 @@
 {
+  "extends": "@sanity/pkg-utils/tsconfig/strictest.json",
   "compilerOptions": {
-    "baseUrl": ".",
-    "target": "esnext",
-    "lib": ["dom", "dom.iterable", "esnext"],
-    "allowJs": true,
-    "skipLibCheck": true,
-    "strict": true,
-    "forceConsistentCasingInFileNames": true,
-    "module": "preserve",
-    "moduleDetection": "force",
-    "isolatedModules": true,
-    "jsx": "preserve",
-    "noImplicitAny": true,
-    "strictNullChecks": true,
-    "strictFunctionTypes": true,
-    "strictPropertyInitialization": true,
-    "noImplicitThis": true,
-    "alwaysStrict": true,
-    "noUnusedLocals": true,
-    "noUnusedParameters": true,
-    "noImplicitReturns": true,
-    "noFallthroughCasesInSwitch": true
+    "rootDir": ".",
+    "outDir": "dist",
+    "paths": {
+      "next-sanity/image": ["./src/image/index.ts"],
+      "next-sanity/preview/live-query": [
+        "./src/preview/LiveQuery/index.ts"
+      ],
+      "next-sanity/preview": ["./src/preview/index.ts"],
+      "next-sanity/studio/client-component": ["./src/studio/client-component/index.ts"],
+      "next-sanity/studio": ["./src/studio/index.ts"],
+      "next-sanity/visual-editing/client-component": ["./src/visual-editing/client-component/index.ts"],
+      "next-sanity/visual-editing/server-actions": ["./src/visual-editing/server-actions/index.ts"],
+      "next-sanity/webhook": ["./src/webhook/index.ts"],
+      "next-sanity": ["./src/index"]
+    }
   }
 }

packages/next-sanity/tsconfig.build.json

@@ -1,12 +1,5 @@
 {
   "extends": "./tsconfig.base",
-  "compilerOptions": {
-    "rootDir": "src",
-    "outDir": "dist",
-    "declaration": true,
-    "emitDeclarationOnly": true,
-    "declarationDir": "lib/dts"
-  },
   "include": ["src/**/*.ts", "src/**/*.tsx"],
-  "exclude": ["dist", "node_modules"]
+  "exclude": ["dist", "node_modules", "./src/**/*.test.ts", "./src/**/*.test.tsx"]
 }

packages/next-sanity/tsconfig.json

@@ -1,15 +1,12 @@
 {
   "extends": "./tsconfig.base",
+  "include": ["**/*.ts", "**/*.tsx"],
+  "exclude": ["dist", "node_modules"],
   "compilerOptions": {
-    "incremental": true,
-    "noEmit": true,
     "plugins": [
       {
         "name": "next"
       }
     ],
-    "strictNullChecks": true
-  },
-  "include": ["**/*.ts", "**/*.tsx", ".next/types/**/*.ts"],
-  "exclude": ["dist", "node_modules"]
+  }
 }