fix: TS import paths importing index.ts twice incorrectly (#6415)

sanity-io · Apr 18, 2024 · 6066e92 · 6066e92
1 parent d591b18
commit 6066e92
Show file tree

Hide file tree

Showing 5 changed files with 35 additions and 5 deletions.
diff --git a/dev/tsconfig.dev.json b/dev/tsconfig.dev.json
@@ -19,7 +19,13 @@
       "@sanity/util": ["./packages/@sanity/util/src/_exports/index.ts"],
       "@sanity/vision": ["./packages/@sanity/vision/src/index.ts"],
       "groq": ["./packages/groq/src/groq.ts"],
-      "sanity/*": ["./packages/sanity/src/_exports/*"],
+      "sanity/_internal": ["./packages/sanity/src/_exports/_internal.ts"],
+      "sanity/cli": ["./packages/sanity/src/_exports/cli.ts"],
+      "sanity/desk": ["./packages/sanity/src/_exports/desk.ts"],
+      "sanity/migrate": ["./packages/sanity/src/_exports/migrate.ts"],
+      "sanity/presentation": ["./packages/sanity/src/_exports/presentation.ts"],
+      "sanity/router": ["./packages/sanity/src/_exports/router.ts"],
+      "sanity/structure": ["./packages/sanity/src/_exports/structure.ts"],
       "sanity": ["./packages/sanity/src/_exports/index.ts"]
     }
   }

diff --git a/examples/tsconfig.json b/examples/tsconfig.json
@@ -19,7 +19,13 @@
       "@sanity/util": ["./packages/@sanity/util/src/_exports/index.ts"],
       "@sanity/vision": ["./packages/@sanity/vision/src/index.ts"],
       "groq": ["./packages/groq/src/groq.ts"],
-      "sanity/*": ["./packages/sanity/src/_exports/*"],
+      "sanity/_internal": ["./packages/sanity/src/_exports/_internal.ts"],
+      "sanity/cli": ["./packages/sanity/src/_exports/cli.ts"],
+      "sanity/desk": ["./packages/sanity/src/_exports/desk.ts"],
+      "sanity/migrate": ["./packages/sanity/src/_exports/migrate.ts"],
+      "sanity/presentation": ["./packages/sanity/src/_exports/presentation.ts"],
+      "sanity/router": ["./packages/sanity/src/_exports/router.ts"],
+      "sanity/structure": ["./packages/sanity/src/_exports/structure.ts"],
       "sanity": ["./packages/sanity/src/_exports/index.ts"]
     }
   }

diff --git a/packages/@sanity/vision/tsconfig.json b/packages/@sanity/vision/tsconfig.json
@@ -35,7 +35,13 @@
       "@sanity/util/*": ["./node_modules/@sanity/util/src/_exports/*"],
       "@sanity/util": ["./node_modules/@sanity/util/src/_exports/index.ts"],
       "groq": ["./node_modules/groq/src/groq.ts"],
-      "sanity/*": ["./node_modules/sanity/src/_exports/*"],
+      "sanity/_internal": ["./node_modules/sanity/src/_exports/_internal.ts"],
+      "sanity/cli": ["./node_modules/sanity/src/_exports/cli.ts"],
+      "sanity/desk": ["./node_modules/sanity/src/_exports/desk.ts"],
+      "sanity/migrate": ["./node_modules/sanity/src/_exports/migrate.ts"],
+      "sanity/presentation": ["./node_modules/sanity/src/_exports/presentation.ts"],
+      "sanity/router": ["./node_modules/sanity/src/_exports/router.ts"],
+      "sanity/structure": ["./node_modules/sanity/src/_exports/structure.ts"],
       "sanity": ["./node_modules/sanity/src/_exports/index.ts"]
     }
   }

diff --git a/packages/sanity/tsconfig.json b/packages/sanity/tsconfig.json
@@ -37,7 +37,13 @@
       "@sanity/util/*": ["./node_modules/@sanity/util/src/_exports/*"],
       "@sanity/util": ["./node_modules/@sanity/util/src/_exports/index.ts"],
       "groq": ["./node_modules/groq/src/groq.ts"],
-      "sanity/*": ["./src/_exports/*"],
+      "sanity/_internal": ["./src/_exports/_internal.ts"],
+      "sanity/cli": ["./src/_exports/cli.ts"],
+      "sanity/desk": ["./src/_exports/desk.ts"],
+      "sanity/migrate": ["./src/_exports/migrate.ts"],
+      "sanity/presentation": ["./src/_exports/presentation.ts"],
+      "sanity/router": ["./src/_exports/router.ts"],
+      "sanity/structure": ["./src/_exports/structure.ts"],
       "sanity": ["./src/_exports/index.ts"]
     }
   }

diff --git a/packages/sanity/tsconfig.settings.json b/packages/sanity/tsconfig.settings.json
@@ -4,7 +4,13 @@
     "rootDir": ".",
     "outDir": "./lib",
     "paths": {
-      "sanity/*": ["./src/_exports/*"],
+      "sanity/_internal": ["./src/_exports/_internal.ts"],
+      "sanity/cli": ["./src/_exports/cli.ts"],
+      "sanity/desk": ["./src/_exports/desk.ts"],
+      "sanity/migrate": ["./src/_exports/migrate.ts"],
+      "sanity/presentation": ["./src/_exports/presentation.ts"],
+      "sanity/router": ["./src/_exports/router.ts"],
+      "sanity/structure": ["./src/_exports/structure.ts"],
       "sanity": ["./src/_exports/index.ts"]
     },
     // For import.meta.env/import.meta.hot definition and similar