fix: revert regression in #1298

sanity-io · Jan 8, 2025 · 445ffc9 · 445ffc9
1 parent a6fe062
commit 445ffc9
Show file tree

Hide file tree

Showing 9 changed files with 63 additions and 66 deletions.
diff --git a/package.json b/package.json
@@ -88,7 +88,7 @@
     "@babel/core": "^7.26.0",
     "@babel/preset-typescript": "^7.26.0",
     "@babel/types": "^7.26.3",
-    "@microsoft/api-extractor": "7.49.0",
+    "@microsoft/api-extractor": "7.48.1",
     "@microsoft/tsdoc-config": "0.17.1",
     "@optimize-lodash/rollup-plugin": "5.0.0",
     "@rollup/plugin-alias": "^5.1.1",

diff --git a/playground/react-18/package.json b/playground/react-18/package.json
@@ -26,7 +26,7 @@
     "react-compiler-runtime": "beta"
   },
   "devDependencies": {
-    "@types/react": "^18.3.18",
+    "@types/react": "^19.0.4",
     "babel-plugin-react-compiler": "beta",
     "react": "^18.3.1"
   },

diff --git a/playground/react-19/package.json b/playground/react-19/package.json
@@ -23,7 +23,7 @@
     "build": "pkg build --strict --check --clean"
   },
   "devDependencies": {
-    "@types/react": "^19.0.3",
+    "@types/react": "^19.0.4",
     "babel-plugin-react-compiler": "beta",
     "react": "^19.0.0"
   },

diff --git a/playground/runtime-next-js/package.json b/playground/runtime-next-js/package.json
@@ -9,7 +9,7 @@
     "dev": "next dev --turbo"
   },
   "devDependencies": {
-    "@types/react": "^19.0.3",
+    "@types/react": "^19.0.4",
     "dummy-module": "workspace:*",
     "next": "^15.1.4",
     "react": "^19.0.0",

diff --git a/playground/sanity/package.json b/playground/sanity/package.json
@@ -48,7 +48,7 @@
     "prepublishOnly": "npm run build"
   },
   "devDependencies": {
-    "@types/react": "^19.0.3",
+    "@types/react": "^19.0.4",
     "babel-plugin-react-compiler": "beta",
     "babel-plugin-styled-components": "^2.1.4",
     "react": "^19.0.0",

diff --git a/playground/use-client-directive/package.json b/playground/use-client-directive/package.json
@@ -25,7 +25,7 @@
     "clean": "rimraf dist"
   },
   "devDependencies": {
-    "@types/react": "^19.0.3",
+    "@types/react": "^19.0.4",
     "react": "^19.0.0"
   },
   "peerDependencies": {

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/src/node/tasks/dts/createApiExtractorConfig.ts b/src/node/tasks/dts/createApiExtractorConfig.ts
@@ -26,24 +26,45 @@ export function createApiExtractorConfig(options: {
     tsconfigPath,
   } = options
 
+  // When the module is 'preserve' it's necessary to override the tsconfig file as api-extractor doesn't handle it out of the box
+  const workaroundModulePreserve = tsconfig.options.module === ts.ModuleKind.Preserve
+  // If `paths` are used for self-referencing imports (e.g. the module is named `sanity`, and the `sanity/structure` export is also importing from `sanity/router`),
+  const workaroundPaths = !!tsconfig.options.paths
+
+  const overrideTsconfig = {
+    extends: tsconfigPath,
+    compilerOptions: {},
+  }
+
+  if (workaroundModulePreserve) {
+    Object.assign(overrideTsconfig.compilerOptions, {
+      // Set the equivalent options to `module: 'Preserve'`
+      // https://github.com/microsoft/TypeScript/pull/56785/files?file-filters%5B%5D=.js&file-filters%5B%5D=.json&file-filters%5B%5D=.symbols&file-filters%5B%5D=.ts&file-filters%5B%5D=.types&show-viewed-files=true#diff-31d3c12bafea26bc9e8c8a77920c41af0c593206442add70c45a06c063767445
+      module: 'ESNext',
+      moduleResolution: 'Bundler',
+      esModuleInterop: true,
+      resolveJsonModule: true,
+    })
+  }
+
+  if (workaroundPaths) {
+    Object.assign(overrideTsconfig.compilerOptions, {
+      // An empty object replaces whatever is in the original tsconfig file
+      paths: {},
+    })
+  }
+
   return {
     apiReport: {
       enabled: false,
       reportFileName: '<unscopedPackageName>.api.md',
     },
     bundledPackages,
-    // If `paths` are used for self-referencing imports (e.g. the module is named `sanity`, and the `sanity/structure` export is also importing from `sanity/router`),
-    compiler: tsconfig.options.paths
-      ? {
-          overrideTsconfig: {
-            extends: tsconfigPath,
-            compilerOptions: {
-              // An empty object replaces whatever is in the original tsconfig file
-              paths: {},
-            },
-          },
-        }
-      : {tsconfigFilePath: tsconfigPath},
+
+    compiler:
+      workaroundModulePreserve || workaroundPaths
+        ? {overrideTsconfig}
+        : {tsconfigFilePath: tsconfigPath},
 
     docModel: {
       enabled: false,

diff --git a/test/__snapshots__/cli.test.ts.snap b/test/__snapshots__/cli.test.ts.snap
@@ -227,21 +227,10 @@ export {
 `;
 
 exports[`should build \`multi-export\` package 6`] = `
-"/** @public */
-export declare function plugin(): Plugin_2
+"import {Plugin as Plugin_2} from 'multi-export'
 
 /** @public */
-declare interface Plugin_2 {
-  name: string
-  options?: PluginOptions
-}
-
-declare interface PluginOptions {
-  /**
-   * @defaultValue true
-   */
-  enabled?: boolean
-}
+export declare function plugin(): Plugin_2
 
 export {}
 "