bunchee 4.4.0 → 4.4.1

package/dist/bin/cli.js

@@ -94,8 +94,9 @@ let createColors = (enabled = isColorSupported)=>({
     });
 picocolors.exports = createColors();
 picocolors.exports.createColors = createColors;
+
 var picocolorsExports = picocolors.exports;
-var pc = /*@__PURE__*/ getDefaultExportFromCjs(picocolorsExports);
+var pc = /*@__PURE__*/getDefaultExportFromCjs(picocolorsExports);
 
 const defaultColorFn = (text)=>text;
 function color(prefixColor) {
@@ -334,8 +335,15 @@ function findExport(exportPath, exportCondition, paths, packageType, currentPath
         };
     }
     // main export '.' from main/module/typings
+    let mainExportCondition;
+    if (pkg.main) {
+        const mainExportType = isEsmPackage ? hasCjsExtension(pkg.main) ? 'require' : 'import' : 'require';
+        mainExportCondition = {
+            [mainExportType]: pkg.main
+        };
+    }
     const defaultMainExport = constructFullExportCondition({
-        [isEsmPackage ? 'import' : 'require']: pkg.main,
+        ...mainExportCondition,
         module: pkg.module,
         types: getTypings(pkg)
     }, packageType);
@@ -401,9 +409,6 @@ function lint$1(pkg) {
     };
     // Validate ESM package
     if (isESM) {
-        if (main && hasCjsExtension(main)) {
-            state.badMainExtension = true;
-        }
         if (exports) {
             if (typeof exports === 'string') {
                 if (hasCjsExtension(exports)) {
@@ -438,6 +443,9 @@ function lint$1(pkg) {
             }
         }
     } else {
+        if (main && path__default.default.extname(main) === '.mjs') {
+            state.badMainExtension = true;
+        }
         // Validate CJS package
         if (exports) {
             if (typeof exports === 'string') {
@@ -474,7 +482,7 @@ function lint$1(pkg) {
         }
     }
     if (state.badMainExtension) {
-        logger.warn('Cannot export `main` field with .cjs extension in ESM package, only .mjs and .js extensions are allowed');
+        logger.warn('Cannot export `main` field with .mjs extension in CJS package, only .js extension is allowed');
     }
     if (state.badMainExport) {
         logger.warn('Cannot export `exports` field with .cjs extension in ESM package, only .mjs and .js extensions are allowed');
@@ -508,7 +516,7 @@ function lint$1(pkg) {
     }
 }
 
-var version = "4.4.0";
+var version = "4.4.1";
 
 function relativify(path) {
     return path.startsWith('.') ? path : `./${path}`;
@@ -709,7 +717,9 @@ async function prepare(cwd) {
             } else {
                 // Update existing exports
                 Object.keys(pkgExports).forEach((exportName)=>{
-                    pkgJson.exports[exportName] = pkgExports[exportName];
+                    if (pkgJson.exports[exportName]) {
+                        pkgJson.exports[exportName] = pkgExports[exportName];
+                    }
                 });
             }
         }
@@ -827,11 +837,11 @@ async function run(args) {
     if (args.prepare) {
         return await prepare(cwd);
     }
-    const entry = source ? path__default.default.resolve(cwd, source) : '';
+    const cliEntry = source ? path__default.default.resolve(cwd, source) : '';
     // lint package
     await lint(cwd);
     try {
-        await bunchee.bundle(entry, bundleConfig);
+        await bunchee.bundle(cliEntry, bundleConfig);
     } catch (err) {
         if (err.name === 'NOT_EXISTED') {
             help();

package/dist/index.d.ts

@@ -33,6 +33,6 @@ type PackageMetadata = {
     typings?: string;
 };
 
-declare function bundle(entryPath: string, { cwd: _cwd, ...options }?: BundleConfig): Promise<any>;
+declare function bundle(cliEntryPath: string, { cwd: _cwd, ...options }?: BundleConfig): Promise<any>;
 
 export { type BundleConfig, bundle };

package/dist/index.js

@@ -82,8 +82,9 @@ let createColors = (enabled = isColorSupported)=>({
     });
 picocolors.exports = createColors();
 picocolors.exports.createColors = createColors;
+
 var picocolorsExports = picocolors.exports;
-var pc = /*@__PURE__*/ getDefaultExportFromCjs(picocolorsExports);
+var pc = /*@__PURE__*/getDefaultExportFromCjs(picocolorsExports);
 
 const availableExtensions = new Set([
     'js',
@@ -233,6 +234,7 @@ function filePathWithoutExtension(file) {
 }
 const nonNullable = (n)=>Boolean(n);
 const hasAvailableExtension = (filename)=>availableExtensions.has(path__default.default.extname(filename).slice(1));
+const hasCjsExtension = (filename)=>path__default.default.extname(filename) === '.cjs';
 // TODO: add unit test
 const baseNameWithoutExtension = (filename)=>path__default.default.basename(filename, path__default.default.extname(filename));
 
@@ -593,8 +595,15 @@ function findExport(exportPath, exportCondition, paths, packageType, currentPath
         };
     }
     // main export '.' from main/module/typings
+    let mainExportCondition;
+    if (pkg.main) {
+        const mainExportType = isEsmPackage ? hasCjsExtension(pkg.main) ? 'require' : 'import' : 'require';
+        mainExportCondition = {
+            [mainExportType]: pkg.main
+        };
+    }
     const defaultMainExport = constructFullExportCondition({
-        [isEsmPackage ? 'import' : 'require']: pkg.main,
+        ...mainExportCondition,
         module: pkg.module,
         types: getTypings(pkg)
     }, packageType);
@@ -798,6 +807,13 @@ async function buildInputConfig(entry, options, buildContext, exportCondition, d
         })
     ];
     if (useTypeScript) {
+        const enableIncrementalWithoutBuildInfo = tsCompilerOptions.incremental && !tsCompilerOptions.tsBuildInfoFile;
+        const incrementalOptions = enableIncrementalWithoutBuildInfo ? {
+            incremental: false
+        } : undefined;
+        const compositeOptions = tsCompilerOptions.composite && enableIncrementalWithoutBuildInfo ? {
+            composite: false
+        } : undefined;
         const { options: overrideResolvedTsOptions } = await convertCompilerOptions(cwd, {
             declaration: true,
             noEmit: false,
@@ -812,9 +828,9 @@ async function buildInputConfig(entry, options, buildContext, exportCondition, d
             } : undefined,
             // error TS5074: Option '--incremental' can only be specified using tsconfig, emitting to single
             // file or when option '--tsBuildInfoFile' is specified.
-            ...tsCompilerOptions.incremental && !tsCompilerOptions.tsBuildInfoFile ? {
-                incremental: false
-            } : undefined
+            ...incrementalOptions,
+            // error TS6379: Composite projects may not disable incremental compilation.
+            ...compositeOptions
         });
         const dtsPlugin = require('rollup-plugin-dts').default({
             tsconfig: tsConfigPath,
@@ -841,17 +857,18 @@ async function buildInputConfig(entry, options, buildContext, exportCondition, d
             preferBuiltins: runtime === 'node',
             extensions: nodeResolveExtensions
         }),
-        commonjs__default.default({
-            exclude: options.external || null
-        }),
-        json__default.default(),
         pluginWasm.wasm(),
         rollupPluginSwc3.swc({
             include: availableESExtensionsRegex,
             exclude: 'node_modules',
-            tsconfig: tsConfigPath,
+            // Use `false` to disable retrieving tsconfig.json
+            tsconfig: tsConfigPath != null ? tsConfigPath : false,
             ...swcOptions
-        })
+        }),
+        commonjs__default.default({
+            exclude: options.external || null
+        }),
+        json__default.default()
     ]).filter(isNotNull);
     return {
         input: entry,
@@ -1284,11 +1301,12 @@ function logOutputState(sizeCollector) {
         }).forEach((item, index)=>{
             const [filename, , size] = item;
             const normalizedExportName = normalizeExportName(exportName);
-            const prefix = index === 0 ? normalizedExportName + ' '.repeat(maxLengthOfExportName - normalizedExportName.length) : ' '.repeat(maxLengthOfExportName);
-            const sizePadding = ' '.repeat(maxFilenameLength - filename.length);
-            const prettiedSize = prettyBytes__default.default(size);
+            const prefix = index === 0 ? normalizedExportName : ' '.repeat(normalizedExportName.length);
+            const filenamePadding = ' '.repeat(Math.max(maxLengthOfExportName, 'Exports'.length) - normalizedExportName.length);
             const isType = isTypeFile(filename);
-            console.log(` ${prefix} ${pc[isType ? 'dim' : 'bold'](filename)}${sizePadding}  ${prettiedSize}`);
+            const sizePadding = ' '.repeat(Math.max(maxFilenameLength, 'File'.length) - filename.length);
+            const prettiedSize = prettyBytes__default.default(size);
+            console.log(prefix, filenamePadding, `${pc[isType ? 'dim' : 'bold'](filename)}`, sizePadding, prettiedSize);
         });
     });
 }
@@ -1357,7 +1375,7 @@ function hasMultiEntryExport(exportPaths) {
     const exportKeys = Object.keys(exportPaths).filter((key)=>key !== './package.json');
     return exportKeys.length > 0 && exportKeys.every((name)=>name.startsWith('.'));
 }
-async function bundle(entryPath, { cwd: _cwd, ...options } = {}) {
+async function bundle(cliEntryPath, { cwd: _cwd, ...options } = {}) {
     const cwd = path.resolve(process.cwd(), _cwd || '');
     assignDefault(options, 'format', 'es');
     assignDefault(options, 'minify', false);
@@ -1369,6 +1387,7 @@ async function bundle(entryPath, { cwd: _cwd, ...options } = {}) {
     const isMultiEntries = hasMultiEntryExport(exportPaths) // exportPathsLength > 1
     ;
     const hasBin = Boolean(pkg.bin);
+    const isFromCli = Boolean(cliEntryPath);
     let tsConfig = await resolveTsConfig(cwd);
     let hasTsConfig = Boolean(tsConfig == null ? void 0 : tsConfig.tsConfigPath);
     const defaultTsOptions = {
@@ -1379,10 +1398,10 @@ async function bundle(entryPath, { cwd: _cwd, ...options } = {}) {
     if (!isMultiEntries) {
         // Use specified string file path if possible, then fallback to the default behavior entry picking logic
         // e.g. "exports": "./dist/index.js" -> use "./index.<ext>" as entry
-        entryPath = entryPath || await getSourcePathFromExportPath(cwd, '.', 'default') || '';
+        cliEntryPath = cliEntryPath || await getSourcePathFromExportPath(cwd, '.', 'default') || '';
     }
     // Handle CLI input
-    if (entryPath) {
+    if (cliEntryPath) {
         let mainEntryPath;
         let typesEntryPath;
         // with -o option
@@ -1401,18 +1420,20 @@ async function bundle(entryPath, { cwd: _cwd, ...options } = {}) {
     }
     const bundleOrWatch = async (rollupConfig)=>{
         if (options.clean) {
-            await removeOutputDir(rollupConfig.output);
+            if (!isFromCli) {
+                await removeOutputDir(rollupConfig.output);
+            }
         }
         if (options.watch) {
             return Promise.resolve(runWatch(rollupConfig));
         }
         return runBundle(rollupConfig);
     };
-    const hasSpecifiedEntryFile = entryPath ? fs__default.default.existsSync(entryPath) && (await fsp__default.default.stat(entryPath)).isFile() : false;
+    const hasSpecifiedEntryFile = cliEntryPath ? fs__default.default.existsSync(cliEntryPath) && (await fsp__default.default.stat(cliEntryPath)).isFile() : false;
     const hasNoEntry = !hasSpecifiedEntryFile && !isMultiEntries && !hasBin;
     if (hasNoEntry) {
-        if (entryPath) {
-            const err = new Error(`Entry file "${entryPath}" does not exist`);
+        if (cliEntryPath) {
+            const err = new Error(`Entry file "${cliEntryPath}" does not exist`);
             err.name = 'NOT_EXISTED';
             return Promise.reject(err);
         } else if (cwd) {
@@ -1424,7 +1445,7 @@ async function bundle(entryPath, { cwd: _cwd, ...options } = {}) {
             }
         }
     }
-    const entries = await collectEntries(pkg, entryPath, exportPaths, cwd);
+    const entries = await collectEntries(pkg, cliEntryPath, exportPaths, cwd);
     const hasTypeScriptFiles = Object.values(entries).some((entry)=>isTypescriptFile(entry.source));
     if (hasTypeScriptFiles && !hasTsConfig) {
         const tsConfigPath = path.resolve(cwd, 'tsconfig.json');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bunchee",
-  "version": "4.4.0",
+  "version": "4.4.1",
   "description": "zero config bundler for js/ts/jsx libraries",
   "bin": "./dist/bin/cli.js",
   "main": "./dist/index.js",