diff --git a/package.config.ts b/package.config.ts index d0a7a9b7..a1ba4ad5 100644 --- a/package.config.ts +++ b/package.config.ts @@ -20,14 +20,11 @@ export default defineConfig({ }, ], rules: { - 'ae-forgotten-export': 'warn', 'ae-incompatible-release-tags': 'error', 'ae-internal-missing-underscore': 'off', 'ae-missing-release-tag': 'error', }, }, - legacyExports: true, - tsconfig: 'tsconfig.dist.json', }) diff --git a/package.json b/package.json index 93c16584..2620708a 100644 --- a/package.json +++ b/package.json @@ -22,6 +22,7 @@ "license": "MIT", "author": "Sanity.io ", "sideEffects": false, + "type": "commonjs", "exports": { ".": { "source": "./exports/index.ts", @@ -50,7 +51,7 @@ "./package.json": "./package.json" }, "main": "./dist/exports/index.js", - "module": "./dist/exports/index.esm.js", + "module": "./dist/exports/index.mjs", "types": "./dist/exports/index.d.ts", "typesVersions": { "*": { @@ -86,7 +87,7 @@ "pkg:check": "pkg --strict", "prepublishOnly": "run-s build", "release": "semantic-release", - "test": "vitest", + "test": "vitest run", "tsdoc:dev": "node -r dotenv-flow/config -r esbuild-register scripts/dev", "type-check": "tsc --build", "watch": "pkg watch", @@ -132,7 +133,7 @@ "@sanity/client": "^6.24.2", "@sanity/color": "^3.0.6", "@sanity/icons": "^3.5.7", - "@sanity/pkg-utils": "6.13.4", + "@sanity/pkg-utils": "7.0.0", "@sanity/ui": "^2.11.1", "@types/cpx": "^1.5.5", "@vitejs/plugin-react": "^4.3.4", @@ -195,8 +196,7 @@ "semantic-release": "^24.2.1", "styled-components": "^6.1.14", "uuid": "^11.0.4", - "vitest": "^2.1.8", - "vitest-github-actions-reporter": "^0.11.1" + "vitest": "^2.1.8" }, "peerDependencies": { "react": "^18 || ^19", diff --git a/playground/multi-export-cjs-legacy/exports/extra.ts b/playground/multi-export-cjs-legacy/exports/extra.ts deleted file mode 100644 index 6973b471..00000000 --- a/playground/multi-export-cjs-legacy/exports/extra.ts +++ /dev/null @@ -1 +0,0 @@ -export * from '../src/extra' diff --git a/playground/multi-export-cjs-legacy/exports/index.ts b/playground/multi-export-cjs-legacy/exports/index.ts deleted file mode 100644 index bf6a4ae6..00000000 --- a/playground/multi-export-cjs-legacy/exports/index.ts +++ /dev/null @@ -1 +0,0 @@ -export * from '../src' diff --git a/playground/multi-export-cjs-legacy/extra.js b/playground/multi-export-cjs-legacy/extra.js deleted file mode 100644 index a6a95adf..00000000 --- a/playground/multi-export-cjs-legacy/extra.js +++ /dev/null @@ -1,2 +0,0 @@ -// AUTO-GENERATED – DO NOT EDIT -export * from './dist/extra.esm' diff --git a/playground/multi-export-cjs-legacy/package.config.ts b/playground/multi-export-cjs-legacy/package.config.ts deleted file mode 100644 index 3d4bb304..00000000 --- a/playground/multi-export-cjs-legacy/package.config.ts +++ /dev/null @@ -1,11 +0,0 @@ -import {defineConfig} from '@sanity/pkg-utils' - -export default defineConfig({ - extract: { - rules: { - 'ae-forgotten-export': 'off', - }, - }, - legacyExports: true, - tsconfig: 'tsconfig.dist.json', -}) diff --git a/playground/multi-export-cjs-legacy/package.json b/playground/multi-export-cjs-legacy/package.json deleted file mode 100644 index 0ed723d5..00000000 --- a/playground/multi-export-cjs-legacy/package.json +++ /dev/null @@ -1,41 +0,0 @@ -{ - "name": "multi-export-cjs-legacy", - "version": "1.0.0", - "private": true, - "license": "MIT", - "sideEffects": false, - "exports": { - ".": { - "source": "./src/index.ts", - "import": "./dist/index.mjs", - "require": "./dist/index.js", - "default": "./dist/index.js" - }, - "./extra": { - "source": "./src/extra.ts", - "import": "./dist/extra.mjs", - "require": "./dist/extra.js", - "default": "./dist/extra.js" - }, - "./package.json": "./package.json" - }, - "main": "./dist/index.js", - "module": "./dist/index.esm.js", - "types": "./dist/index.d.ts", - "files": ["dist"], - "typesVersions": { - "*": { - "extra": [ - "./dist/extra.d.ts" - ] - } - }, - "scripts": { - "build": "pkg build --strict --check --clean", - "etl": "sanity-tsdoc etl --outDir ../../etc --strict" - }, - "browserslist": "extends @sanity/browserslist-config", - "devDependencies": { - "@sanity/tsdoc": "workspace:*" - } -} diff --git a/playground/multi-export-cjs-legacy/src/extra.ts b/playground/multi-export-cjs-legacy/src/extra.ts deleted file mode 100644 index 11ab4078..00000000 --- a/playground/multi-export-cjs-legacy/src/extra.ts +++ /dev/null @@ -1,4 +0,0 @@ -import {type ExtraType} from 'multi-export-cjs-legacy' - -/** @beta */ -export const extra: ExtraType = 'foo' diff --git a/playground/multi-export-cjs-legacy/src/index.ts b/playground/multi-export-cjs-legacy/src/index.ts deleted file mode 100644 index 5f76fe6d..00000000 --- a/playground/multi-export-cjs-legacy/src/index.ts +++ /dev/null @@ -1,5 +0,0 @@ -/** @public */ -export const version = {major: 1, minor: 0, patch: 0} - -/** @public */ -export type ExtraType = 'foo' | 'bar' diff --git a/playground/multi-export-cjs-legacy/tsconfig.dist.json b/playground/multi-export-cjs-legacy/tsconfig.dist.json deleted file mode 100644 index dc12c0ef..00000000 --- a/playground/multi-export-cjs-legacy/tsconfig.dist.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "extends": "./tsconfig.settings", - "include": ["./exports", "./src"], - "compilerOptions": { - "declaration": true, - "rootDir": ".", - "outDir": "./dist" - } -} diff --git a/playground/multi-export-cjs-legacy/tsconfig.json b/playground/multi-export-cjs-legacy/tsconfig.json deleted file mode 100644 index fc708e3f..00000000 --- a/playground/multi-export-cjs-legacy/tsconfig.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "extends": "./tsconfig.settings", - "include": ["**/*.ts"], - "exclude": ["./dist"], - "compilerOptions": { - "composite": true, - - "rootDir": ".", - "outDir": "./dist" - } -} diff --git a/playground/multi-export-cjs-legacy/tsconfig.settings.json b/playground/multi-export-cjs-legacy/tsconfig.settings.json deleted file mode 100644 index d69576c6..00000000 --- a/playground/multi-export-cjs-legacy/tsconfig.settings.json +++ /dev/null @@ -1,34 +0,0 @@ -{ - "compilerOptions": { - "paths": { - "multi-export-cjs-legacy": ["./exports/index.ts"], - "multi-export-cjs-legacy/extra": ["./exports/extra.ts"] - }, - - "target": "ES2022", - "sourceMap": true, - "module": "Preserve", - "moduleDetection": "force", - "jsx": "preserve", - - // Strict type-checking - "strict": true, - "noImplicitAny": true, - "strictNullChecks": true, - "strictFunctionTypes": true, - "strictPropertyInitialization": true, - "noImplicitThis": true, - "alwaysStrict": true, - - // Additional checks - "noUnusedLocals": true, - "noUnusedParameters": true, - "noImplicitReturns": true, - "noFallthroughCasesInSwitch": true, - "skipLibCheck": true, - - // Module resolution - "allowSyntheticDefaultImports": true, - "esModuleInterop": true - } -} diff --git a/playground/multi-export-cjs-legacy/tsdoc.config.ts b/playground/multi-export-cjs-legacy/tsdoc.config.ts deleted file mode 100644 index c10eeeb1..00000000 --- a/playground/multi-export-cjs-legacy/tsdoc.config.ts +++ /dev/null @@ -1,12 +0,0 @@ -import {defineConfig} from '@sanity/tsdoc' - -import packageConfig from './package.config' - -export default defineConfig({ - extract: packageConfig.extract, - legacyExports: packageConfig.legacyExports, - input: { - type: 'fs', - tsconfig: packageConfig.tsconfig, - }, -}) diff --git a/playground/multi-export-cjs/package.config.ts b/playground/multi-export-cjs/package.config.ts index 1142e21a..32b92328 100644 --- a/playground/multi-export-cjs/package.config.ts +++ b/playground/multi-export-cjs/package.config.ts @@ -1,10 +1,5 @@ import {defineConfig} from '@sanity/pkg-utils' export default defineConfig({ - extract: { - rules: { - 'ae-forgotten-export': 'off', - }, - }, tsconfig: 'tsconfig.dist.json', }) diff --git a/playground/multi-export-legacy/exports/extra.ts b/playground/multi-export-legacy/exports/extra.ts deleted file mode 100644 index 6973b471..00000000 --- a/playground/multi-export-legacy/exports/extra.ts +++ /dev/null @@ -1 +0,0 @@ -export * from '../src/extra' diff --git a/playground/multi-export-legacy/exports/index.ts b/playground/multi-export-legacy/exports/index.ts deleted file mode 100644 index bf6a4ae6..00000000 --- a/playground/multi-export-legacy/exports/index.ts +++ /dev/null @@ -1 +0,0 @@ -export * from '../src' diff --git a/playground/multi-export-legacy/extra.js b/playground/multi-export-legacy/extra.js deleted file mode 100644 index a6a95adf..00000000 --- a/playground/multi-export-legacy/extra.js +++ /dev/null @@ -1,2 +0,0 @@ -// AUTO-GENERATED – DO NOT EDIT -export * from './dist/extra.esm' diff --git a/playground/multi-export-legacy/package.config.ts b/playground/multi-export-legacy/package.config.ts deleted file mode 100644 index 3d4bb304..00000000 --- a/playground/multi-export-legacy/package.config.ts +++ /dev/null @@ -1,11 +0,0 @@ -import {defineConfig} from '@sanity/pkg-utils' - -export default defineConfig({ - extract: { - rules: { - 'ae-forgotten-export': 'off', - }, - }, - legacyExports: true, - tsconfig: 'tsconfig.dist.json', -}) diff --git a/playground/multi-export-legacy/package.json b/playground/multi-export-legacy/package.json deleted file mode 100644 index 6fac7013..00000000 --- a/playground/multi-export-legacy/package.json +++ /dev/null @@ -1,42 +0,0 @@ -{ - "name": "multi-export-legacy", - "version": "1.0.0", - "private": true, - "license": "MIT", - "sideEffects": false, - "type": "module", - "exports": { - ".": { - "source": "./src/index.ts", - "import": "./dist/index.js", - "require": "./dist/index.cjs", - "default": "./dist/index.js" - }, - "./extra": { - "source": "./src/extra.ts", - "import": "./dist/extra.js", - "require": "./dist/extra.cjs", - "default": "./dist/extra.js" - }, - "./package.json": "./package.json" - }, - "main": "./dist/index.cjs", - "module": "./dist/index.esm.js", - "files": ["dist"], - "types": "./dist/index.d.ts", - "typesVersions": { - "*": { - "extra": [ - "./dist/extra.d.ts" - ] - } - }, - "scripts": { - "build": "pkg build --strict --check --clean", - "etl": "sanity-tsdoc etl --outDir ../../etc --strict" - }, - "browserslist": "extends @sanity/browserslist-config", - "devDependencies": { - "@sanity/tsdoc": "workspace:*" - } -} diff --git a/playground/multi-export-legacy/src/extra.ts b/playground/multi-export-legacy/src/extra.ts deleted file mode 100644 index b4a1d250..00000000 --- a/playground/multi-export-legacy/src/extra.ts +++ /dev/null @@ -1,4 +0,0 @@ -import {type ExtraType} from 'multi-export-legacy' - -/** @beta */ -export const extra: ExtraType = 'foo' diff --git a/playground/multi-export-legacy/src/index.ts b/playground/multi-export-legacy/src/index.ts deleted file mode 100644 index 5f76fe6d..00000000 --- a/playground/multi-export-legacy/src/index.ts +++ /dev/null @@ -1,5 +0,0 @@ -/** @public */ -export const version = {major: 1, minor: 0, patch: 0} - -/** @public */ -export type ExtraType = 'foo' | 'bar' diff --git a/playground/multi-export-legacy/tsconfig.dist.json b/playground/multi-export-legacy/tsconfig.dist.json deleted file mode 100644 index dc12c0ef..00000000 --- a/playground/multi-export-legacy/tsconfig.dist.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "extends": "./tsconfig.settings", - "include": ["./exports", "./src"], - "compilerOptions": { - "declaration": true, - "rootDir": ".", - "outDir": "./dist" - } -} diff --git a/playground/multi-export-legacy/tsconfig.json b/playground/multi-export-legacy/tsconfig.json deleted file mode 100644 index 43a8928a..00000000 --- a/playground/multi-export-legacy/tsconfig.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "extends": "./tsconfig.settings", - "include": ["**/*.ts"], - "exclude": ["./dist"], - "compilerOptions": { - "composite": true, - - "rootDir": ".", - "outDir": "./dist", - } -} diff --git a/playground/multi-export-legacy/tsconfig.settings.json b/playground/multi-export-legacy/tsconfig.settings.json deleted file mode 100644 index 23e4e4e2..00000000 --- a/playground/multi-export-legacy/tsconfig.settings.json +++ /dev/null @@ -1,34 +0,0 @@ -{ - "compilerOptions": { - "paths": { - "multi-export-legacy": ["./exports/index.ts"], - "multi-export-legacy/extra": ["./exports/extra.ts"] - }, - - "target": "ES2022", - "sourceMap": true, - "module": "Preserve", - "moduleDetection": "force", - "jsx": "preserve", - - // Strict type-checking - "strict": true, - "noImplicitAny": true, - "strictNullChecks": true, - "strictFunctionTypes": true, - "strictPropertyInitialization": true, - "noImplicitThis": true, - "alwaysStrict": true, - - // Additional checks - "noUnusedLocals": true, - "noUnusedParameters": true, - "noImplicitReturns": true, - "noFallthroughCasesInSwitch": true, - "skipLibCheck": true, - - // Module resolution - "allowSyntheticDefaultImports": true, - "esModuleInterop": true - } -} diff --git a/playground/multi-export-legacy/tsdoc.config.ts b/playground/multi-export-legacy/tsdoc.config.ts deleted file mode 100644 index c10eeeb1..00000000 --- a/playground/multi-export-legacy/tsdoc.config.ts +++ /dev/null @@ -1,12 +0,0 @@ -import {defineConfig} from '@sanity/tsdoc' - -import packageConfig from './package.config' - -export default defineConfig({ - extract: packageConfig.extract, - legacyExports: packageConfig.legacyExports, - input: { - type: 'fs', - tsconfig: packageConfig.tsconfig, - }, -}) diff --git a/playground/multi-export/package.config.ts b/playground/multi-export/package.config.ts index 1142e21a..32b92328 100644 --- a/playground/multi-export/package.config.ts +++ b/playground/multi-export/package.config.ts @@ -1,10 +1,5 @@ import {defineConfig} from '@sanity/pkg-utils' export default defineConfig({ - extract: { - rules: { - 'ae-forgotten-export': 'off', - }, - }, tsconfig: 'tsconfig.dist.json', }) diff --git a/playground/mylib-bundling-ts/package.config.ts b/playground/mylib-bundling-ts/package.config.ts index 3516cc22..d899e681 100644 --- a/playground/mylib-bundling-ts/package.config.ts +++ b/playground/mylib-bundling-ts/package.config.ts @@ -15,6 +15,5 @@ export default defineConfig({ }, ], }, - legacyExports: true, tsconfig: 'tsconfig.dist.json', }) diff --git a/playground/mylib-bundling-ts/package.json b/playground/mylib-bundling-ts/package.json index 5e26531d..50b6e311 100644 --- a/playground/mylib-bundling-ts/package.json +++ b/playground/mylib-bundling-ts/package.json @@ -4,6 +4,7 @@ "private": true, "license": "MIT", "sideEffects": false, + "type": "commonjs", "exports": { ".": { "source": "./src/index.ts", @@ -14,7 +15,7 @@ "./package.json": "./package.json" }, "main": "./dist/index.js", - "module": "./dist/index.esm.js", + "module": "./dist/index.mjs", "files": ["dist"], "types": "./dist/index.d.ts", "scripts": { diff --git a/playground/mylib-bundling-ts/tsdoc.config.ts b/playground/mylib-bundling-ts/tsdoc.config.ts index cdbd884a..657f31da 100644 --- a/playground/mylib-bundling-ts/tsdoc.config.ts +++ b/playground/mylib-bundling-ts/tsdoc.config.ts @@ -4,7 +4,6 @@ import packageConfig from './package.config' export default defineConfig({ extract: packageConfig.extract, - legacyExports: packageConfig.legacyExports, input: { type: 'fs', tsconfig: 'tsconfig.tsdoc.json', diff --git a/playground/mylib/package.config.ts b/playground/mylib/package.config.ts index 052f1175..34a83fa8 100644 --- a/playground/mylib/package.config.ts +++ b/playground/mylib/package.config.ts @@ -10,6 +10,5 @@ export default defineConfig({ }, ], }, - legacyExports: true, tsconfig: 'tsconfig.dist.json', }) diff --git a/playground/mylib/package.json b/playground/mylib/package.json index 0f4f292a..52826795 100644 --- a/playground/mylib/package.json +++ b/playground/mylib/package.json @@ -4,6 +4,7 @@ "private": true, "license": "MIT", "sideEffects": false, + "type": "commonjs", "exports": { ".": { "source": "./src/index.ts", @@ -14,7 +15,7 @@ "./package.json": "./package.json" }, "main": "./dist/index.js", - "module": "./dist/index.esm.js", + "module": "./dist/index.mjs", "types": "./dist/index.d.ts", "files": ["dist"], "scripts": { diff --git a/playground/mylib/tsdoc.config.ts b/playground/mylib/tsdoc.config.ts index c10eeeb1..7cb4a93a 100644 --- a/playground/mylib/tsdoc.config.ts +++ b/playground/mylib/tsdoc.config.ts @@ -4,7 +4,6 @@ import packageConfig from './package.config' export default defineConfig({ extract: packageConfig.extract, - legacyExports: packageConfig.legacyExports, input: { type: 'fs', tsconfig: packageConfig.tsconfig, diff --git a/playground/ts/package.config.ts b/playground/ts/package.config.ts index dee0ad31..964890ea 100644 --- a/playground/ts/package.config.ts +++ b/playground/ts/package.config.ts @@ -14,5 +14,4 @@ export default defineConfig({ 'ae-missing-release-tag': 'warn', }, }, - legacyExports: true, }) diff --git a/playground/ts/package.json b/playground/ts/package.json index ddcbf882..1c608f7c 100644 --- a/playground/ts/package.json +++ b/playground/ts/package.json @@ -4,6 +4,7 @@ "private": true, "license": "MIT", "sideEffects": false, + "type": "commonjs", "exports": { ".": { "source": "./src/index.ts", @@ -15,7 +16,7 @@ }, "main": "./dist/index.js", - "module": "./dist/index.esm.js", + "module": "./dist/index.mjs", "types": "./dist/index.d.ts", "files": ["dist"], "scripts": { diff --git a/playground/ts/tsdoc.config.ts b/playground/ts/tsdoc.config.ts index c10eeeb1..7cb4a93a 100644 --- a/playground/ts/tsdoc.config.ts +++ b/playground/ts/tsdoc.config.ts @@ -4,7 +4,6 @@ import packageConfig from './package.config' export default defineConfig({ extract: packageConfig.extract, - legacyExports: packageConfig.legacyExports, input: { type: 'fs', tsconfig: packageConfig.tsconfig, diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 66ed03d8..6f1aa8b8 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -44,8 +44,8 @@ importers: specifier: ^3.5.7 version: 3.5.7(react@19.0.0) '@sanity/pkg-utils': - specifier: 6.13.4 - version: 6.13.4(@types/babel__core@7.20.5)(@types/node@20.17.12)(babel-plugin-react-compiler@19.0.0-beta-63e3235-20250105)(debug@4.4.0)(typescript@5.7.3) + specifier: 7.0.0 + version: 7.0.0(@types/babel__core@7.20.5)(@types/node@20.17.12)(babel-plugin-react-compiler@19.0.0-beta-63e3235-20250105)(typescript@5.7.3) '@sanity/ui': specifier: ^2.11.1 version: 2.11.1(@emotion/is-prop-valid@1.2.2)(react-dom@19.0.0(react@19.0.0))(react-is@19.0.0)(react@19.0.0)(styled-components@6.1.14(react-dom@19.0.0(react@19.0.0))(react@19.0.0)) @@ -230,9 +230,6 @@ importers: vitest: specifier: ^2.1.8 version: 2.1.8(@types/node@20.17.12)(jsdom@23.2.0)(terser@5.37.0) - vitest-github-actions-reporter: - specifier: ^0.11.1 - version: 0.11.1(vitest@2.1.8(@types/node@20.17.12)(jsdom@23.2.0)(terser@5.37.0)) playground/multi-export: devDependencies: @@ -246,18 +243,6 @@ importers: specifier: workspace:* version: link:../.. - playground/multi-export-cjs-legacy: - devDependencies: - '@sanity/tsdoc': - specifier: workspace:* - version: link:../.. - - playground/multi-export-legacy: - devDependencies: - '@sanity/tsdoc': - specifier: workspace:* - version: link:../.. - playground/mylib: dependencies: react: @@ -1790,6 +1775,17 @@ packages: babel-plugin-react-compiler: optional: true + '@sanity/pkg-utils@7.0.0': + resolution: {integrity: sha512-Dc58XR08E/6v9ZyWxbsHaIhsA4WR1OxgF6ZBR6BgKqdJQrf7qyGUBR+opsOZPY1aTF8hM5iM9pAkVldYP92pwA==} + engines: {node: '>=18.17.0'} + hasBin: true + peerDependencies: + babel-plugin-react-compiler: '*' + typescript: 5.4.x || 5.5.x || 5.6.x || 5.7.x + peerDependenciesMeta: + babel-plugin-react-compiler: + optional: true + '@sanity/presentation@1.20.1': resolution: {integrity: sha512-w45QJs8HrVIodSVpIKPwb3wizWSwUeFPMDkqwi90LZ6JXYaji9NjIBDEWxdwAli1RPU01UTEWyzRBfSpqP+nwA==} engines: {node: '>=16.14'} @@ -6890,12 +6886,6 @@ packages: yaml: optional: true - vitest-github-actions-reporter@0.11.1: - resolution: {integrity: sha512-ZHHB0wBgOPhMYCB17WKVlJZa+5SdudBZFoVoebwfq3ioIUTeLQGYHwh85vpdJAxRghLP8d0qI/6eCTueGyDVXA==} - engines: {node: '>=14.16.0'} - peerDependencies: - vitest: '>=0.28.5' - vitest@2.1.8: resolution: {integrity: sha512-1vBKTZskHw/aosXqQUlVWWlGUxSJR8YtiyZDJAFeW2kPAeX6S3Sool0mjspO+kXLuxVWlEDDowBAeqeAQefqLQ==} engines: {node: ^18.0.0 || >=20.0.0} @@ -8832,6 +8822,58 @@ snapshots: - debug - supports-color + '@sanity/pkg-utils@7.0.0(@types/babel__core@7.20.5)(@types/node@20.17.12)(babel-plugin-react-compiler@19.0.0-beta-63e3235-20250105)(typescript@5.7.3)': + dependencies: + '@babel/core': 7.26.0 + '@babel/preset-typescript': 7.26.0(@babel/core@7.26.0) + '@babel/types': 7.26.3 + '@microsoft/api-extractor': 7.49.0(@types/node@20.17.12) + '@microsoft/tsdoc-config': 0.17.1 + '@optimize-lodash/rollup-plugin': 5.0.0(rollup@4.30.1) + '@rollup/plugin-alias': 5.1.1(rollup@4.30.1) + '@rollup/plugin-babel': 6.0.4(@babel/core@7.26.0)(@types/babel__core@7.20.5)(rollup@4.30.1) + '@rollup/plugin-commonjs': 28.0.2(rollup@4.30.1) + '@rollup/plugin-json': 6.1.0(rollup@4.30.1) + '@rollup/plugin-node-resolve': 16.0.0(rollup@4.30.1) + '@rollup/plugin-replace': 6.0.2(rollup@4.30.1) + '@rollup/plugin-terser': 0.4.4(rollup@4.30.1) + '@sanity/browserslist-config': 1.0.5 + browserslist: 4.24.4 + cac: 6.7.14 + chalk: 4.1.2 + chokidar: 4.0.3 + esbuild: 0.24.2 + esbuild-register: 3.6.0(esbuild@0.24.2) + find-config: 1.0.0 + get-latest-version: 5.1.0(debug@4.4.0) + git-url-parse: 16.0.0 + globby: 11.1.0 + jsonc-parser: 3.3.1 + mkdirp: 3.0.1 + outdent: 0.8.0 + parse-git-config: 3.0.0 + pkg-up: 3.1.0 + prettier: 3.4.2 + pretty-bytes: 5.6.0 + prompts: 2.4.2 + recast: 0.23.9 + rimraf: 4.4.1 + rollup: 4.30.1 + rollup-plugin-esbuild: 6.1.1(esbuild@0.24.2)(rollup@4.30.1) + rxjs: 7.8.1 + treeify: 1.1.0 + typescript: 5.7.3 + uuid: 11.0.4 + zod: 3.24.1 + zod-validation-error: 3.4.0(zod@3.24.1) + optionalDependencies: + babel-plugin-react-compiler: 19.0.0-beta-63e3235-20250105 + transitivePeerDependencies: + - '@types/babel__core' + - '@types/node' + - debug + - supports-color + '@sanity/presentation@1.20.1(@emotion/is-prop-valid@1.2.2)(@sanity/color@3.0.6)(debug@4.4.0)(react-dom@19.0.0(react@19.0.0))(react-is@19.0.0)(react@19.0.0)(styled-components@6.1.14(react-dom@19.0.0(react@19.0.0))(react@19.0.0))': dependencies: '@sanity/client': 6.24.2(debug@4.4.0) @@ -14645,11 +14687,6 @@ snapshots: terser: 5.37.0 yaml: 2.7.0 - vitest-github-actions-reporter@0.11.1(vitest@2.1.8(@types/node@20.17.12)(jsdom@23.2.0)(terser@5.37.0)): - dependencies: - '@actions/core': 1.11.1 - vitest: 2.1.8(@types/node@20.17.12)(jsdom@23.2.0)(terser@5.37.0) - vitest@2.1.8(@types/node@20.17.12)(jsdom@23.2.0)(terser@5.37.0): dependencies: '@vitest/expect': 2.1.8 diff --git a/src/cli/etl/etlCommand.ts b/src/cli/etl/etlCommand.ts index b3d66157..8c3431e0 100644 --- a/src/cli/etl/etlCommand.ts +++ b/src/cli/etl/etlCommand.ts @@ -59,7 +59,6 @@ export async function etlCommand(options: { strict, tsconfig: config?.input?.tsconfig ?? tsconfigPath, bundledPackages: config?.input?.bundledPackages, - legacyExports: config?.legacyExports ?? false, }) const jsonPath = path.resolve(packagePath, outDir, `${pkg.name}/${pkg.version}.json`) diff --git a/src/core/config/types.ts b/src/core/config/types.ts index 5a3642dd..2eb9d744 100644 --- a/src/core/config/types.ts +++ b/src/core/config/types.ts @@ -7,7 +7,6 @@ export interface SanityTSDocConfigOptions { port?: number } extract?: PkgConfigOptions['extract'] - legacyExports?: PkgConfigOptions['legacyExports'] input?: { type: 'fs' pattern?: string | string[] diff --git a/src/core/extract/extract.ts b/src/core/extract/extract.ts index c626f7b8..1664a134 100644 --- a/src/core/extract/extract.ts +++ b/src/core/extract/extract.ts @@ -39,7 +39,6 @@ export async function extract(options: { packagePath: string rules?: NonNullable['rules'] strict: boolean - legacyExports: boolean tsconfig?: string bundledPackages?: string[] }): Promise<{pkg: PackageJSON; results: ExtractResult[]}> { @@ -48,7 +47,6 @@ export async function extract(options: { packagePath, rules, strict, - legacyExports, tsconfig: tsconfigPath = 'tsconfig.json', bundledPackages = [], } = options @@ -61,7 +59,7 @@ export async function extract(options: { const config = await loadConfig({cwd}) const strictOptions = parseStrictOptions(config?.strictOptions ?? {}) const logger = createLogger() - const pkg = await loadPkgWithReporting({cwd, logger, strict, legacyExports}) + const pkg = await loadPkgWithReporting({cwd, logger, strict}) logger.info('Using tsconfig: ', path.resolve(packagePath, tsconfigPath)) @@ -70,7 +68,6 @@ export async function extract(options: { cwd, pkg, strict, - legacyExports, logger, strictOptions, }) diff --git a/test/cli.test.ts b/test/cli.test.ts index 7e277b34..73f3e21e 100644 --- a/test/cli.test.ts +++ b/test/cli.test.ts @@ -50,21 +50,6 @@ describe('cli', () => { expect(stdout).toContain('wrote 10 documents to ../../etc/multi-export/1.0.0.json') }) - test('run `etl` command in `multi-export-legacy`', async () => { - const project = await _spawnProject('multi-export-legacy') - - await project.install() - await project.run('build') - - expect(await project.dirs()).toEqual(['dist', 'exports', 'node_modules', 'src']) - - const {stdout} = await project.run('etl') - - expect(await project.dirs()).toEqual(['dist', 'exports', 'node_modules', 'src']) - - expect(stdout).toContain('wrote 10 documents to ../../etc/multi-export-legacy/1.0.0.json') - }) - test('run `etl` command in `multi-export-cjs`', async () => { const project = await _spawnProject('multi-export-cjs') @@ -79,19 +64,4 @@ describe('cli', () => { expect(stdout).toContain('wrote 10 documents to ../../etc/multi-export-cjs/1.0.0.json') }) - - test('run `etl` command in `multi-export-cjs-legacy`', async () => { - const project = await _spawnProject('multi-export-cjs-legacy') - - await project.install() - await project.run('build') - - expect(await project.dirs()).toEqual(['dist', 'exports', 'node_modules', 'src']) - - const {stdout} = await project.run('etl') - - expect(await project.dirs()).toEqual(['dist', 'exports', 'node_modules', 'src']) - - expect(stdout).toContain('wrote 10 documents to ../../etc/multi-export-cjs-legacy/1.0.0.json') - }) }) diff --git a/test/extract.test.ts b/test/extract.test.ts index c574d813..119aa858 100644 --- a/test/extract.test.ts +++ b/test/extract.test.ts @@ -22,7 +22,6 @@ describe('extract', () => { customTags: [{name: 'sampleCustomBlockTag', syntaxKind: 'block', allowMultiple: true}], packagePath: project.cwd, strict: true, - legacyExports: true, tsconfig: 'tsconfig.dist.json', }) @@ -43,7 +42,6 @@ describe('extract', () => { customTags: [{name: 'sampleCustomBlockTag', syntaxKind: 'block', allowMultiple: true}], packagePath: project.cwd, strict: true, - legacyExports: false, tsconfig: 'tsconfig.dist.json', }) diff --git a/test/load.test.ts b/test/load.test.ts index 88930aff..fa189713 100644 --- a/test/load.test.ts +++ b/test/load.test.ts @@ -21,7 +21,6 @@ describe('load', () => { const {pkg, results} = await extract({ packagePath: project.cwd, strict: true, - legacyExports: true, }) const docs = transform(results, {package: {version: pkg.version}}) diff --git a/test/transform.test.ts b/test/transform.test.ts index e54fd20e..c984497a 100644 --- a/test/transform.test.ts +++ b/test/transform.test.ts @@ -22,7 +22,6 @@ describe.skipIf(process.env['GITHUB_ACTIONS'] && platform !== 'linux')('transfor vi.setConfig({testTimeout: 60000, hookTimeout: 60000}) const strict = true - const legacyExports = true let tsProject: _SpawnedProject let myLibProject: _SpawnedProject let multiExportProject: _SpawnedProject @@ -44,7 +43,6 @@ describe.skipIf(process.env['GITHUB_ACTIONS'] && platform !== 'linux')('transfor customTags: [{name: 'sampleCustomBlockTag', syntaxKind: 'block', allowMultiple: true}], packagePath: myLibProject.cwd, strict, - legacyExports, }) const docs = transform(results, {package: {version: pkg.version}}) @@ -57,7 +55,6 @@ describe.skipIf(process.env['GITHUB_ACTIONS'] && platform !== 'linux')('transfor customTags: [{name: 'sampleCustomBlockTag', syntaxKind: 'block', allowMultiple: true}], packagePath: myLibProject.cwd, strict, - legacyExports, }) const docs = transform(results, {package: {version: pkg.version}}) @@ -71,7 +68,6 @@ describe.skipIf(process.env['GITHUB_ACTIONS'] && platform !== 'linux')('transfor customTags: [{name: 'sampleCustomBlockTag', syntaxKind: 'block', allowMultiple: true}], packagePath: myLibProject.cwd, strict, - legacyExports, }) const docs = transform(results, {package: {version: pkg.version}}) @@ -85,7 +81,6 @@ describe.skipIf(process.env['GITHUB_ACTIONS'] && platform !== 'linux')('transfor customTags: [{name: 'sampleCustomBlockTag', syntaxKind: 'block', allowMultiple: true}], packagePath: myLibProject.cwd, strict, - legacyExports, }) const docs = transform(results, {package: {version: pkg.version}}) @@ -118,7 +113,6 @@ describe.skipIf(process.env['GITHUB_ACTIONS'] && platform !== 'linux')('transfor customTags: [{name: 'sampleCustomBlockTag', syntaxKind: 'block', allowMultiple: true}], packagePath: myLibProject.cwd, strict, - legacyExports, }) const docs = transform(results, {package: {version: pkg.version}}) @@ -133,7 +127,6 @@ describe.skipIf(process.env['GITHUB_ACTIONS'] && platform !== 'linux')('transfor packagePath: multiExportProject.cwd, tsconfig: 'tsconfig.dist.json', strict, - legacyExports: false, }) for (const result of results) { @@ -166,7 +159,7 @@ describe.skipIf(process.env['GITHUB_ACTIONS'] && platform !== 'linux')('transfor }) test('should transform package with namespace exports', async () => { - const {pkg, results} = await extract({packagePath: tsProject.cwd, strict, legacyExports}) + const {pkg, results} = await extract({packagePath: tsProject.cwd, strict}) const docs = transform(results, {package: {version: pkg.version}}) @@ -181,7 +174,6 @@ describe.skipIf(process.env['GITHUB_ACTIONS'] && platform !== 'linux')('transfor const {pkg, results} = await extract({ packagePath: tsProject.cwd, strict, - legacyExports, }) const docs = transform(results, {package: {version: pkg.version}}) @@ -270,7 +262,6 @@ describe.skipIf(process.env['GITHUB_ACTIONS'] && platform !== 'linux')('transfor const {pkg, results} = await extract({ packagePath: tsProject.cwd, strict, - legacyExports, }) const docs = transform(results, {package: {version: pkg.version}}) diff --git a/tsconfig.json b/tsconfig.json index 9454dfff..da635f84 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -25,9 +25,7 @@ }, "references": [ {"path": "./playground/multi-export"}, - {"path": "./playground/multi-export-legacy"}, {"path": "./playground/multi-export-cjs"}, - {"path": "./playground/multi-export-cjs-legacy"}, {"path": "./playground/mylib"}, {"path": "./playground/ts"} ] diff --git a/tsdoc.config.ts b/tsdoc.config.ts index 61c98ed2..4dc34341 100644 --- a/tsdoc.config.ts +++ b/tsdoc.config.ts @@ -14,8 +14,6 @@ export default defineConfig({ }, }, - legacyExports: pkgConfig.legacyExports, - input: { type: 'fs', tsconfig: pkgConfig.tsconfig, diff --git a/vitest.config.ts b/vitest.config.ts index a8bd87ba..b8b8a6cb 100644 --- a/vitest.config.ts +++ b/vitest.config.ts @@ -1,5 +1,4 @@ import {defineConfig} from 'vitest/config' -import GithubActionsReporter from 'vitest-github-actions-reporter' export default defineConfig({ test: { @@ -10,7 +9,7 @@ export default defineConfig({ } }, // Enable rich PR failed test annotation on the CI - reporters: process.env.GITHUB_ACTIONS ? ['default', new GithubActionsReporter()] : 'default', + reporters: process.env.GITHUB_ACTIONS ? ['default', 'github-actions'] : 'default', watchExclude: [ '**/.tsdoc/**', '**/node_modules/**',