@sanity/pkg-utils 6.13.3-canary.0 → 6.13.3-canary.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sanity/pkg-utils",
-  "version": "6.13.3-canary.0",
+  "version": "6.13.3-canary.3",
   "description": "Simple utilities for modern npm packages.",
   "keywords": [
     "sanity-io",
@@ -145,8 +145,7 @@
     "ts-node": "^10.9.2",
     "typescript": "5.7.2",
     "vitest": "^2.1.8",
-    "vitest-github-actions-reporter": "^0.11.1",
-    "@sanity/pkg-utils": "6.13.3-canary.0"
+    "@sanity/pkg-utils": "6.13.3-canary.3"
   },
   "peerDependencies": {
     "babel-plugin-react-compiler": "*",
@@ -176,7 +175,7 @@
     "playground:build": "pnpm --filter './playground/**' build",
     "playground:clean": "pnpm --filter './playground/**' --silent clean",
     "pretest": "run-s playground:clean",
-    "test": "vitest",
+    "test": "vitest run",
     "test:update-snapshots": "pnpm test run -- --update",
     "watch": "node -r esbuild-register scripts/watch"
   }

package/src/node/core/config/types.ts

@@ -222,6 +222,9 @@ export interface PkgConfigOptions {
     bundledPackages?: PkgConfigProperty<string[]>
     customTags?: TSDocCustomTag[]
     rules?: {
+      /**
+       * @deprecated no longer needed since TypeScript 5.5 https://devblogs.microsoft.com/typescript/announcing-typescript-5-5/#consulting-package.json-dependencies-for-declaration-file-generation
+       */
       'ae-forgotten-export'?: PkgRuleLevel
       'ae-incompatible-release-tags'?: PkgRuleLevel
       'ae-internal-missing-underscore'?: PkgRuleLevel

package/src/node/tasks/dts/createApiExtractorConfig.ts

@@ -1,7 +1,6 @@
 import path from 'node:path'
 
 import type {IConfigFile, IExtractorMessagesConfig} from '@microsoft/api-extractor'
-import ts from 'typescript'
 
 export function createApiExtractorConfig(options: {
   bundledPackages?: string[]
@@ -11,7 +10,6 @@ export function createApiExtractorConfig(options: {
   messages: IExtractorMessagesConfig
   projectFolder: string
   mainEntryPointFilePath: string
-  tsconfig: ts.ParsedCommandLine
   tsconfigPath: string
 }): IConfigFile {
   const {
@@ -22,48 +20,16 @@ export function createApiExtractorConfig(options: {
     messages,
     projectFolder,
     mainEntryPointFilePath,
-    tsconfig,
     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,
-    compiler:
-      workaroundModulePreserve || workaroundPaths
-        ? {overrideTsconfig}
-        : {tsconfigFilePath: tsconfigPath},
+    compiler: {tsconfigFilePath: tsconfigPath},
 
     docModel: {
       enabled: false,

package/src/node/tasks/dts/doExtract.ts

@@ -50,7 +50,6 @@ export async function doExtract(
     const result = await extractTypes({
       bundledPackages: bundledPackages || [],
       customTags: config?.extract?.customTags,
-      cwd,
       distPath: outDir,
       exportPath,
       files,
@@ -58,7 +57,6 @@ export async function doExtract(
       projectPath: cwd,
       rules: config?.extract?.rules,
       sourceTypesPath: sourceTypesPath,
-      tsconfig: ts.config,
       tmpPath,
       tsconfigPath: path.resolve(cwd, ts.configPath || 'tsconfig.json'),
     })

package/src/node/tasks/dts/dtsWatchTask.ts

@@ -102,7 +102,6 @@ export const dtsWatchTask: TaskHandler<DtsWatchTask, DtsResult> = {
             const result = await extractTypes({
               bundledPackages: bundledPackages || [],
               customTags: config?.extract?.customTags,
-              cwd,
               distPath: outDir,
               exportPath,
               files,
@@ -110,7 +109,6 @@ export const dtsWatchTask: TaskHandler<DtsWatchTask, DtsResult> = {
               projectPath: cwd,
               rules: config?.extract?.rules,
               sourceTypesPath: sourceTypesPath,
-              tsconfig: tsContext.config!,
               tmpPath,
               tsconfigPath: path.resolve(cwd, tsContext.configPath || 'tsconfig.json'),
             })

package/src/node/tasks/dts/extractTypes.ts

@@ -9,7 +9,6 @@ import {
 } from '@microsoft/api-extractor'
 import {mkdirp} from 'mkdirp'
 import prettier from 'prettier'
-import type ts from 'typescript'
 
 import type {BuildFile, PkgConfigOptions} from '../../core'
 import {createApiExtractorConfig} from './createApiExtractorConfig'
@@ -20,7 +19,6 @@ import {getExtractMessagesConfig} from './getExtractMessagesConfig'
 export async function extractTypes(options: {
   bundledPackages?: string[]
   customTags: NonNullable<PkgConfigOptions['extract']>['customTags']
-  cwd: string
   distPath: string
   exportPath: string
   filePaths: string[]
@@ -29,7 +27,6 @@ export async function extractTypes(options: {
   rules?: NonNullable<PkgConfigOptions['extract']>['rules']
   sourceTypesPath: string
   tmpPath: string
-  tsconfig: ts.ParsedCommandLine
   tsconfigPath: string
 }): Promise<{extractorResult: ExtractorResult; messages: ExtractorMessage[]}> {
   const {
@@ -43,7 +40,6 @@ export async function extractTypes(options: {
     rules,
     sourceTypesPath,
     tmpPath,
-    tsconfig,
     tsconfigPath,
   } = options
 
@@ -63,7 +59,6 @@ export async function extractTypes(options: {
       messages: getExtractMessagesConfig({rules}),
       projectFolder: projectPath,
       mainEntryPointFilePath: sourceTypesPath,
-      tsconfig,
       tsconfigPath,
     }),
     configObjectFullPath: undefined,

package/src/node/tasks/dts/getExtractMessagesConfig.ts

@@ -38,7 +38,7 @@ export function getExtractMessagesConfig(options: {
       },
 
       'ae-forgotten-export': {
-        logLevel: ruleToLogLevel('ae-forgotten-export', 'error' as ExtractorLogLevel),
+        logLevel: ruleToLogLevel('ae-forgotten-export', 'none' as ExtractorLogLevel),
         addToApiReportFile: false,
       },