bunchee 6.10.0 → 6.12.0

package/README.md

@@ -6,11 +6,11 @@
 
 <p align="left">
   <a href="https://npm.im/bunchee">
-    <img src="https://badgen.net/npm/v/bunchee">
+    <img src="https://img.shields.io/npm/v/bunchee?style=flat&colorA=000000&colorB=000000">
   </a>
 
-  <a href="https://github.com/huozhi/bunchee/actions?workflow=CI">
-    <img src="https://github.com/huozhi/bunchee/workflows/CI/badge.svg">
+  <a href="https://npm.im/bunchee">
+    <img src="https://img.shields.io/npm/dt/bunchee.svg?style=flat&colorA=000000&colorB=000000">
   </a>
 </p>
 
@@ -28,6 +28,13 @@ By using the standard `exports` configuration as the single source of truth, **b
 npm install --save-dev bunchee typescript
 ```
 
+> [!NOTE]
+> TypeScript 7+ compiles natively and its `typescript` package no longer ships the JavaScript compiler API used for generating type declarations. If you're on TypeScript 7 or above, also install the official compat API package [`@typescript/typescript6`](https://www.npmjs.com/package/@typescript/typescript6) and `bunchee` will pick it up automatically:
+>
+> ```sh
+> npm install --save-dev @typescript/typescript6
+> ```
+
 ### Configuration
 
 Create entry files of your library and `package.json`.
@@ -550,14 +557,6 @@ export { readme, config, styles, content }
 
 All these imports will be bundled as string content, regardless of the original file extension.
 
-### Agent Skills
-
-If you want to use bunchee with coding agents with skills, run:
-
-```sh
-npx skills add huozhi/npm-skills
-```
-
 ### Node.js API
 
 ```ts

package/dist/bin/cli.js

@@ -525,9 +525,8 @@ function addToExportDistMap(exportToDist, exportPath, outputConditionPairs) {
  *  './index.react-server': { development: ..., default: ... }
  * }
  */ async function parseExports(pkg, cwd) {
-    var _pkg_exports;
+    var _pkg_exports, _pkg_bin;
     const exportsField = (_pkg_exports = pkg.exports) != null ? _pkg_exports : {};
-    var _pkg_bin;
     const bins = (_pkg_bin = pkg.bin) != null ? _pkg_bin : {};
     const exportToDist = new Map();
     const isEsmPkg = isESModulePackage(pkg.type);
@@ -856,7 +855,7 @@ async function lint$1(cwd) {
     }
 }
 
-var version = "6.10.0";
+var version = "6.12.0";
 
 async function writeDefaultTsconfig(tsConfigPath) {
     await fs.promises.writeFile(tsConfigPath, JSON.stringify(DEFAULT_TS_CONFIG, null, 2), 'utf-8');

package/dist/index.js

@@ -306,7 +306,7 @@ function validateEntryFiles(entryFiles) {
 
 function exit(err) {
     logger.error(err);
-    throw new Error(err) ;
+    throw typeof err === 'string' ? new Error(err) : err;
 }
 async function getPackageMeta(cwd) {
     const pkgFilePath = path__default.default.resolve(cwd, 'package.json');
@@ -650,9 +650,8 @@ function addToExportDistMap(exportToDist, exportPath, outputConditionPairs) {
  *  './index.react-server': { development: ..., default: ... }
  * }
  */ async function parseExports(pkg, cwd) {
-    var _pkg_exports;
+    var _pkg_exports, _pkg_bin;
     const exportsField = (_pkg_exports = pkg.exports) != null ? _pkg_exports : {};
-    var _pkg_bin;
     const bins = (_pkg_bin = pkg.bin) != null ? _pkg_bin : {};
     const exportToDist = new Map();
     const isEsmPkg = isESModulePackage(pkg.type);
@@ -915,6 +914,12 @@ function getSpecialExportTypeFromSourcePath(sourcePath) {
     const fileBaseName = baseNameWithoutExtension(sourcePath);
     return getSpecialExportTypeFromComposedExportPath(fileBaseName);
 }
+const ModuleFormat = {
+    none: 0,
+    esm: 1,
+    cjs: 2,
+    all: 3
+};
 function getExportTypeFromExportTypesArray(types) {
     let exportType = 'default';
     new Set(types).forEach((value)=>{
@@ -1033,9 +1038,16 @@ async function collectSourceEntriesByExportPath(sourceFolderPath, originalSubpat
  */ async function collectSourceEntriesFromExportPaths(sourceFolderPath, parsedExportsInfo, pkg) {
     const bins = new Map();
     const exportsEntries = new Map();
+    let requiredPrivateModuleFormats = ModuleFormat.none;
     for (const [exportPath, exportInfo] of parsedExportsInfo.entries()){
         const specialConditions = new Set();
-        for (const [_, composedExportType] of exportInfo){
+        for (const [outputPath, composedExportType] of exportInfo){
+            // Collect required private shared module formats while walking export outputs.
+            const exportType = composedExportType.split('.').pop();
+            if (exportType !== 'types') {
+                const ext = path__default.default.extname(outputPath).slice(1);
+                requiredPrivateModuleFormats |= isCjsExportName(pkg, composedExportType, ext) ? ModuleFormat.cjs : ModuleFormat.esm;
+            }
             const specialExportType = getSpecialExportTypeFromComposedExportPath(composedExportType);
             if (specialExportType !== 'default') {
                 specialConditions.add(specialExportType);
@@ -1064,6 +1076,7 @@ async function collectSourceEntriesByExportPath(sourceFolderPath, originalSubpat
         ],
         expandDirectories: false
     });
+    const defaultPrivateModuleFormats = requiredPrivateModuleFormats !== ModuleFormat.none ? requiredPrivateModuleFormats : ModuleFormat.all;
     for (const file of privateFiles){
         const sourceFileAbsolutePath = path__default.default.join(sourceFolderPath, file);
         const exportPath = sourceFilenameToExportFullPath(file);
@@ -1074,31 +1087,36 @@ async function collectSourceEntriesByExportPath(sourceFolderPath, originalSubpat
         // export type: default => ''
         // export type: development => '.development'
         const condPart = isSpecialExport ? specialExportType + '.' : '';
+        const sourceExt = path__default.default.extname(file).slice(1);
+        const formats = sourceExt === 'cts' ? ModuleFormat.cjs : sourceExt === 'mts' ? ModuleFormat.esm : defaultPrivateModuleFormats;
         // Map private shared files to the dist directory
         // e.g. ./_utils.ts -> ./dist/_utils.js
-        // TODO: improve the logic to only generate the required files, not all possible files
         const isTs = isTypescriptFile(file);
-        const typesInfos = [
-            [
-                posixRelativify(path.posix.join('./dist', exportPath + (isEsmPkg ? '.d.ts' : '.d.mts'))),
-                condPart + 'import.types'
-            ],
-            [
-                posixRelativify(path.posix.join('./dist', exportPath + (isEsmPkg ? '.d.cts' : '.d.ts'))),
-                condPart + 'require.types'
-            ]
-        ];
-        const privateExportInfo = [
-            ...isTs ? typesInfos : [],
-            [
+        const privateExportInfo = [];
+        if (formats === ModuleFormat.esm || formats === ModuleFormat.all) {
+            if (isTs) {
+                privateExportInfo.push([
+                    posixRelativify(path.posix.join('./dist', exportPath + (isEsmPkg ? '.d.ts' : '.d.mts'))),
+                    condPart + 'import.types'
+                ]);
+            }
+            privateExportInfo.push([
                 posixRelativify(path.posix.join('./dist', exportPath + (isEsmPkg ? '.js' : '.mjs'))),
                 condPart + 'import.default'
-            ],
-            [
+            ]);
+        }
+        if (formats === ModuleFormat.cjs || formats === ModuleFormat.all) {
+            if (isTs) {
+                privateExportInfo.push([
+                    posixRelativify(path.posix.join('./dist', exportPath + (isEsmPkg ? '.d.cts' : '.d.ts'))),
+                    condPart + 'require.types'
+                ]);
+            }
+            privateExportInfo.push([
                 posixRelativify(path.posix.join('./dist', exportPath + (isEsmPkg ? '.cjs' : '.js'))),
                 condPart + 'require.default'
-            ]
-        ];
+            ]);
+        }
         const exportsInfo = parsedExportsInfo.get(normalizedExportPath);
         if (!exportsInfo) {
             // Add private shared files to parsedExportsInfo
@@ -1202,27 +1220,80 @@ const memoizeByKey = (fn)=>{
 };
 const memoize = (fn)=>createMemoize(fn);
 
+// TypeScript 7+ compiles natively and its `typescript` package no longer ships
+// the JavaScript compiler API (the main export only contains the version).
+// `@typescript/typescript6` is the official package re-exporting the TS 6 API.
+const TS_COMPAT_PACKAGE = '@typescript/typescript6';
 let hasLoggedTsWarning = false;
-function resolveTypescript(cwd) {
-    let ts;
-    const m = new module$1.Module('', undefined);
-    m.paths = module$1.Module._nodeModulePaths(cwd);
+let hasLoggedTsCompatFallback = false;
+let hasRedirectedTsRequire = false;
+// Resolve to a concrete file path (works in both Node.js and Bun); the TS 7 fallback also needs the path to redirect `require('typescript')`.
+function resolveModulePath(request, paths) {
     try {
-        // Bun does not yet support the `Module` class properly.
-        if (typeof (m == null ? void 0 : m.require) === 'undefined') {
-            const tsPath = require.resolve('typescript', {
-                paths: module$1.Module._nodeModulePaths(cwd)
-            });
+        return require.resolve(request, {
+            paths
+        });
+    } catch  {
+        return null;
+    }
+}
+function hasTsCompilerApi(ts) {
+    return typeof (ts == null ? void 0 : ts.readConfigFile) === 'function' && typeof (ts == null ? void 0 : ts.parseJsonConfigFileContent) === 'function';
+}
+// Redirect `require('typescript')` to the TS 6 compat API so dependencies
+// relying on the JS compiler API (e.g. rollup-plugin-dts) keep working
+// when the workspace TypeScript is v7+.
+function redirectTypescriptRequire(tsApiPath) {
+    if (hasRedirectedTsRequire) return;
+    hasRedirectedTsRequire = true;
+    const moduleAny = module$1.Module;
+    const originalResolveFilename = moduleAny._resolveFilename;
+    moduleAny._resolveFilename = function(request, ...args) {
+        if (request === 'typescript') {
+            return tsApiPath;
+        }
+        return originalResolveFilename.apply(this, [
+            request,
+            ...args
+        ]);
+    };
+}
+function resolveTypescript(cwd) {
+    const searchPaths = module$1.Module._nodeModulePaths(cwd);
+    const tsPath = resolveModulePath('typescript', searchPaths);
+    let ts = null;
+    if (tsPath) {
+        try {
             ts = require(tsPath);
-        } else {
-            ts = m.require('typescript');
+        } catch (e) {
+            console.error(e);
         }
-    } catch (e) {
-        console.error(e);
+    }
+    if (!ts) {
         if (!hasLoggedTsWarning) {
             hasLoggedTsWarning = true;
             exit('Could not load TypeScript compiler. Try to install `typescript` as dev dependency');
         }
+        return ts;
+    }
+    if (!hasTsCompilerApi(ts)) {
+        var _resolveModulePath;
+        const tsCompatPath = (_resolveModulePath = resolveModulePath(TS_COMPAT_PACKAGE, searchPaths)) != null ? _resolveModulePath : resolveModulePath(TS_COMPAT_PACKAGE, [
+            __dirname
+        ]);
+        if (!tsCompatPath) {
+            if (!hasLoggedTsWarning) {
+                hasLoggedTsWarning = true;
+                exit(`Detected TypeScript ${ts.version || '7+'}, which no longer ships the JavaScript compiler API required for generating type declarations. Install \`${TS_COMPAT_PACKAGE}\` as dev dependency to keep building types`);
+            }
+            return ts;
+        }
+        redirectTypescriptRequire(tsCompatPath);
+        if (!hasLoggedTsCompatFallback) {
+            hasLoggedTsCompatFallback = true;
+            logger.log(pc.dim(`Using ${TS_COMPAT_PACKAGE} API for TypeScript ${ts.version} type declaration generation`));
+        }
+        ts = require(tsCompatPath);
     }
     return ts;
 }
@@ -1299,21 +1370,16 @@ async function writeDefaultTsconfig(tsConfigPath) {
 
 const FILENAME_REGEX = /__filename/;
 const DIRNAME_REGEX = /__dirname/;
-// not char, or space before require(.resolve)?(
-const GLOBAL_REQUIRE_REGEX = /(?:^|[^.\w'"`])\brequire(\.resolve)?\(\s*[\r\n]*(\w|['"`])/;
 const PolyfillComment = '/** rollup-private-do-not-use-esm-shim-polyfill */';
-const createESMShim = ({ filename, dirname, globalRequire })=>{
+const createESMShim = ({ filename, dirname })=>{
     const useNodeUrl = filename || dirname;
     const useNodePath = dirname;
-    const useNodeModule = globalRequire;
     return `\
 ${PolyfillComment}
 ${useNodeUrl ? `import __node_cjsUrl from 'node:url'` : ''};
 ${useNodePath ? `import __node_cjsPath from 'node:path';` : ''}
-${useNodeModule ? `import __node_cjsModule from 'node:module';` : ''}
 ${useNodeUrl ? 'const __filename = __node_cjsUrl.fileURLToPath(import.meta.url);' : ''}
 ${useNodePath ? 'const __dirname = __node_cjsPath.dirname(__filename);' : ''}
-${useNodeModule ? 'const require = __node_cjsModule.createRequire(import.meta.url);' : ''}
 `.trim() + '\n';
 };
 function esmShim() {
@@ -1328,17 +1394,13 @@ function esmShim() {
                 }
                 let hasFilename = false;
                 let hasDirname = false;
-                let hasGlobalRequire = false;
                 if (FILENAME_REGEX.test(code)) {
                     hasFilename = true;
                 }
                 if (DIRNAME_REGEX.test(code)) {
                     hasDirname = true;
                 }
-                if (GLOBAL_REQUIRE_REGEX.test(code)) {
-                    hasGlobalRequire = true;
-                }
-                if (!hasFilename && !hasDirname && !hasGlobalRequire) {
+                if (!hasFilename && !hasDirname) {
                     return null;
                 }
                 const magicString = new MagicString__default.default(code);
@@ -1370,8 +1432,7 @@ function esmShim() {
                 }
                 magicString.appendRight(end, '\n' + createESMShim({
                     filename: hasFilename,
-                    dirname: hasDirname,
-                    globalRequire: hasGlobalRequire
+                    dirname: hasDirname
                 }));
                 return {
                     code: magicString.toString(),
@@ -1406,8 +1467,8 @@ function minify(code) {
     return cleanCssInstance.minify(code).styles;
 }
 function inlineCss(options) {
-    const cssIds = new Set();
     var _options_exclude;
+    const cssIds = new Set();
     const filter = pluginutils.createFilter([
         '**/*.css'
     ], (_options_exclude = options.exclude) != null ? _options_exclude : []);
@@ -1809,11 +1870,11 @@ async function createDtsPlugin(tsCompilerOptions, tsConfigPath, respectExternal,
 }
 const memoizeDtsPluginByKey = memoizeByKey(createDtsPlugin);
 async function buildInputConfig(entry, bundleConfig, exportCondition, buildContext, dts) {
+    var _bundleConfig_external;
     var _bundleConfig_file, _bundleConfig_file1;
     const { entries, pkg, cwd, tsOptions: { tsConfigPath, tsCompilerOptions }, browserslistConfig, pluginContext } = buildContext;
     const isBinEntry = isBinExportPath(exportCondition.name);
     const hasNoExternal = bundleConfig.external === null;
-    var _bundleConfig_external;
     const externals = hasNoExternal ? [] : [
         pkg.peerDependencies,
         pkg.dependencies,
@@ -2124,6 +2185,7 @@ function createSplitChunks(dependencyGraphMap, entryFiles) {
 }
 
 async function buildOutputConfigs(bundleConfig, exportCondition, buildContext, dts) {
+    var _exportCondition_export_types;
     const { format } = bundleConfig;
     const { entries, pkg, cwd, tsOptions: { tsCompilerOptions }, pluginContext } = buildContext;
     // Add esm mark and interop helper if esm export is detected
@@ -2131,7 +2193,6 @@ async function buildOutputConfigs(bundleConfig, exportCondition, buildContext, d
     const absoluteOutputFile = path.resolve(cwd, bundleConfig.file);
     const isEsmPkg = isESModulePackage(pkg.type);
     const name = filePathWithoutExtension(absoluteOutputFile);
-    var _exportCondition_export_types;
     const dtsFile = path.resolve(cwd, dts ? bundleConfig.file : (_exportCondition_export_types = exportCondition.export.types) != null ? _exportCondition_export_types : getExportFileTypePath(bundleConfig.file));
     const typesDir = path.dirname(dtsFile);
     const jsDir = path.dirname(absoluteOutputFile);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bunchee",
-  "version": "6.10.0",
+  "version": "6.12.0",
   "description": "zero config bundler for js/ts/jsx libraries",
   "bin": "./dist/bin/cli.js",
   "main": "./dist/index.js",
@@ -10,17 +10,18 @@
     "test:update": "TEST_UPDATE_SNAPSHOT=1 pnpm test",
     "test:post": "cross-env POST_BUILD=1 pnpm test test/compile.test.ts test/integration.test.ts",
     "site": "next dev docs",
-    "docs:build": "next build docs",
+    "docs:build": "pnpm --dir docs install && next build docs",
     "clean": "rm -rf ./dist",
     "new-test": "node ./scripts/new-test.js",
     "test:ts-matrix": "node ./scripts/test-ts-matrix.js all",
     "test:ts5": "node ./scripts/test-ts-matrix.js ts5",
     "test:ts6": "node ./scripts/test-ts-matrix.js ts6",
+    "test:ts7": "node ./scripts/test-ts-matrix.js ts7",
     "typecheck": "tsc --noEmit && tsc -p test/tsconfig.json --noEmit",
     "prepare-release": "pnpm clean && pnpm build",
     "publish-local": "pnpm prepare-release && pnpm test && pnpm publish",
     "prepublishOnly": "pnpm prepare-release && chmod +x ./dist/bin/cli.js",
-    "run-ts": "cross-env SWC_NODE_IGNORE_DYNAMIC=1 node -r @swc-node/register",
+    "run-ts": "cross-env SWC_NODE_IGNORE_DYNAMIC=1 node -r ./scripts/ts6-compat.js -r @swc-node/register",
     "ts-bunchee": "pnpm run-ts ./src/bin/index.ts",
     "build-dir": "pnpm ts-bunchee --cwd",
     "build": "pnpm run-ts ./src/bin/index.ts --runtime node",
@@ -59,20 +60,20 @@
   },
   "license": "MIT",
   "dependencies": {
-    "@rollup/plugin-commonjs": "^29.0.0",
+    "@rollup/plugin-commonjs": "^29.0.3",
     "@rollup/plugin-json": "^6.1.0",
-    "@rollup/plugin-node-resolve": "^16.0.1",
-    "@rollup/plugin-replace": "^6.0.2",
+    "@rollup/plugin-node-resolve": "^16.0.3",
+    "@rollup/plugin-replace": "^6.0.3",
     "@rollup/plugin-wasm": "^6.2.2",
-    "@rollup/pluginutils": "^5.1.4",
-    "@swc/core": "^1.13.3",
+    "@rollup/pluginutils": "^5.4.0",
+    "@swc/core": "^1.15.40",
     "@swc/helpers": "^0.5.17",
     "clean-css": "^5.3.3",
     "magic-string": "^0.30.17",
     "nanospinner": "^1.2.2",
     "picomatch": "^4.0.2",
     "pretty-bytes": "^5.6.0",
-    "rollup": "^4.52.4",
+    "rollup": "^4.61.0",
     "rollup-plugin-dts": "^6.4.1",
     "rollup-plugin-swc3": "^0.11.1",
     "rollup-preserve-directives": "^1.1.3",
@@ -81,7 +82,7 @@
     "yargs": "^17.7.2"
   },
   "peerDependencies": {
-    "typescript": "^4.1 || ^5.0 || ^6.0"
+    "typescript": "^4.1 || ^5.0 || ^6.0 || ^7.0"
   },
   "peerDependenciesMeta": {
     "typescript": {
@@ -93,7 +94,7 @@
   },
   "devDependencies": {
     "@huozhi/testing-package": "1.0.0",
-    "@swc-node/register": "^1.10.9",
+    "@swc-node/register": "^1.11.1",
     "@swc/types": "^0.1.17",
     "@tailwindcss/postcss": "^4.1.8",
     "@types/clean-css": "^4.2.11",
@@ -102,12 +103,12 @@
     "@types/react": "^19.2.14",
     "@types/react-dom": "^19.2.3",
     "@types/yargs": "^17.0.33",
-    "@typescript/native-preview": "*",
+    "@typescript/typescript6": "^6.0.2",
     "bunchee": "link:./",
     "cross-env": "^7.0.3",
     "husky": "^9.0.11",
     "lint-staged": "^15.2.2",
-    "next": "16.1.1-canary.31",
+    "next": "^16.2.6",
     "picocolors": "^1.0.0",
     "postcss": "^8.5.4",
     "prettier": "3.4.2",
@@ -115,10 +116,10 @@
     "react-dom": "^19.2.1",
     "tailwindcss": "^4.1.8",
     "typescript": "^6.0.2",
-    "vitest": "^3.0.4"
+    "vitest": "^4.1.8"
   },
   "lint-staged": {
     "*.{js,jsx,ts,tsx,md,json,yml,yaml}": "prettier --write"
   },
-  "packageManager": "pnpm@9.4.0"
+  "packageManager": "pnpm@11.10.0"
 }