bunchee 5.0.0-beta.3 → 5.0.0-beta.5

package/README.md

@@ -326,6 +326,7 @@ import { AppContext } from './app-context.shared-runtime'
 - Minify (`-m`): Compress output.
 - Watch (`-w`): Watch for source file changes.
 - No Clean(`--no-clean`): Do not clean the dist folder before building. (default: `false`)
+- TSConfig (`--tsconfig <path>`): Specify the path to the TypeScript configuration file. (default: `tsconfig.json`)
 
 ```sh
 cd <project-root-dir>
@@ -458,6 +459,7 @@ await bundle(path.resolve('./src/index.ts'), {
   runtime: 'nodejs', // 'browser' | 'nodejs'
   cwd: process.cwd(), // string
   clean: true, // boolean
+  tsconfig: 'tsconfig.json', // string
 })
 ```
 

package/dist/bin/cli.js

@@ -456,7 +456,7 @@ function lint$1(pkg) {
     }
 }
 
-var version = "5.0.0-beta.3";
+var version = "5.0.0-beta.5";
 
 function relativify(path) {
     return path.startsWith('.') ? path : `./${path}`;
@@ -799,6 +799,7 @@ Options:
   --sourcemap            enable sourcemap generation, default: false
   --dts                  determine if need to generate types, default: undefined
   --no-dts               do not generate types, default: undefined
+  --tsconfig             path to tsconfig file, default: tsconfig.json
 `;
 function help() {
     logger.log(helpMessage);
@@ -830,6 +831,7 @@ function parseCliArgs(argv) {
         '--no-external': Boolean,
         '--no-clean': Boolean,
         '--prepare': Boolean,
+        '--tsconfig': String,
         '-h': '--help',
         '-v': '--version',
         '-w': '--watch',
@@ -857,13 +859,14 @@ function parseCliArgs(argv) {
         external: !!args['--no-external'] ? null : args['--external'],
         clean: !args['--no-clean'],
         env: args['--env'],
-        prepare: !!args['--prepare']
+        prepare: !!args['--prepare'],
+        tsconfig: args['--tsconfig']
     };
     return parsedArgs;
 }
 async function run(args) {
     var _args_external;
-    const { source, format, watch, minify, sourcemap, target, runtime, dts, env, clean } = args;
+    const { source, format, watch, minify, sourcemap, target, runtime, dts, env, clean, tsconfig } = args;
     const cwd = args.cwd || process.cwd();
     const file = args.file ? path__default.default.resolve(cwd, args.file) : undefined;
     const bundleConfig = {
@@ -878,7 +881,8 @@ async function run(args) {
         minify: !!minify,
         sourcemap: sourcemap === false ? false : true,
         env: (env == null ? void 0 : env.split(',')) || [],
-        clean
+        clean,
+        tsconfig
     };
     if (args.version) {
         return logger.log(version);

package/dist/index.d.ts

@@ -18,6 +18,7 @@ type BundleConfig = {
     runtime?: string;
     pkg?: PackageMetadata;
     clean?: boolean;
+    tsconfig?: string;
 };
 type PackageMetadata = {
     name?: string;

package/dist/index.js

@@ -1,6 +1,5 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var rollup = require('rollup');
 var fsp = require('fs/promises');
 var fs = require('fs');
 var path = require('path');
@@ -19,6 +18,7 @@ var MagicString = require('magic-string');
 var CleanCSS = require('clean-css');
 var pluginutils = require('@rollup/pluginutils');
 var prettyBytes = require('pretty-bytes');
+var rollup = require('rollup');
 
 function _interopDefault (e) { return e && e.__esModule ? e : { default: e }; }
 
@@ -187,18 +187,6 @@ function isTypescriptFile(filename) {
 function fileExists(filePath) {
     return fs__default.default.existsSync(filePath);
 }
-async function removeDir(dirPath) {
-    try {
-        const dirStat = await fsp__default.default.stat(dirPath);
-        if (dirStat.isDirectory()) {
-            await rimraf.rimraf(dirPath);
-        }
-    } catch (err) {
-        if (err.code !== 'ENOENT') {
-            throw err;
-        }
-    }
-}
 const isNotNull = (n)=>Boolean(n);
 function resolveSourceFile(cwd, filename) {
     return path__default.default.resolve(cwd, SRC, filename);
@@ -287,9 +275,29 @@ function joinRelativePath(...segments) {
 function isESModulePackage(packageType) {
     return packageType === 'module';
 }
+async function removeDir(dirPath) {
+    try {
+        const dirStat = await fsp__default.default.stat(dirPath);
+        if (dirStat.isDirectory()) {
+            await rimraf.rimraf(dirPath);
+        }
+    } catch (err) {
+        if (err.code !== 'ENOENT') {
+            throw err;
+        }
+    }
+}
+const removedDirs = new Set();
+async function removeOutputDir(output, cwd) {
+    const dir = output.dir;
+    if (dir && dir !== cwd && !removedDirs.has(dir)) {
+        await removeDir(dir);
+        removedDirs.add(dir);
+    }
+}
 
 let hasLoggedTsWarning = false;
-function resolveTypescriptHandler(cwd) {
+function resolveTypescript(cwd) {
     let ts;
     const m = new module$1.Module('', undefined);
     m.paths = module$1.Module._nodeModulePaths(cwd);
@@ -304,12 +312,12 @@ function resolveTypescriptHandler(cwd) {
     }
     return ts;
 }
-const resolveTypescript = memoize(resolveTypescriptHandler);
-function resolveTsConfigHandler(cwd) {
+function resolveTsConfigHandler(cwd, tsconfig = 'tsconfig.json') {
     let tsCompilerOptions = {};
     let tsConfigPath;
-    tsConfigPath = path.resolve(cwd, 'tsconfig.json');
+    tsConfigPath = path.resolve(cwd, tsconfig);
     if (fileExists(tsConfigPath)) {
+        // Use the original ts handler to avoid memory leak
         const ts = resolveTypescript(cwd);
         const basePath = tsConfigPath ? path.dirname(tsConfigPath) : cwd;
         const tsconfigJSON = ts.readConfigFile(tsConfigPath, ts.sys.readFile).config;
@@ -324,6 +332,7 @@ function resolveTsConfigHandler(cwd) {
 }
 const resolveTsConfig = memoize(resolveTsConfigHandler);
 async function convertCompilerOptions(cwd, json) {
+    // Use the original ts handler to avoid memory leak
     const ts = resolveTypescript(cwd);
     return ts.convertCompilerOptionsFromJson(json, './');
 }
@@ -1472,6 +1481,9 @@ function createOutputState({ entries }) {
                         if (chunk.type !== 'chunk') {
                             return;
                         }
+                        if (!chunk.isEntry) {
+                            return;
+                        }
                         const size = chunk.code.length;
                         const sourceFileName = chunk.facadeModuleId || '';
                         const exportPath = removeScope(reversedMapping.get(sourceFileName) || '.');
@@ -1552,6 +1564,53 @@ function logOutputState(sizeCollector) {
     });
 }
 
+async function createAssetRollupJobs(options, buildContext, { isFromCli, generateTypes }) {
+    const assetsConfigs = await buildEntryConfig(options, buildContext, false);
+    const typesConfigs = generateTypes ? await buildEntryConfig(options, buildContext, true) : [];
+    const allConfigs = assetsConfigs.concat(typesConfigs);
+    for (const config of allConfigs){
+        if (options.clean && !isFromCli) {
+            await removeOutputDir(config.output, buildContext.cwd);
+        }
+    }
+    const rollupJobs = allConfigs.map((rollupConfig)=>bundleOrWatch(options, rollupConfig));
+    return await Promise.all(rollupJobs);
+}
+async function bundleOrWatch(options, rollupConfig) {
+    if (options.watch) {
+        return runWatch(rollupConfig);
+    }
+    return runBundle(rollupConfig);
+}
+function runBundle({ input, output }) {
+    return rollup.rollup(input).then((bundle)=>{
+        return bundle.write(output);
+    }, catchErrorHandler);
+}
+function runWatch({ input, output }) {
+    const watchOptions = [
+        {
+            ...input,
+            output: output,
+            watch: {
+                exclude: [
+                    'node_modules/**'
+                ]
+            }
+        }
+    ];
+    const watcher = rollup.watch(watchOptions);
+    return watcher;
+}
+function catchErrorHandler(error) {
+    if (!error) return;
+    logger.error(error);
+    // filter out the rollup plugin error information such as loc/frame/code...
+    const err = new Error(error.message);
+    err.stack = error.stack;
+    throw err;
+}
+
 function assignDefault(options, name, defaultValue) {
     if (!(name in options) || options[name] == null) {
         options[name] = defaultValue;
@@ -1573,7 +1632,7 @@ async function bundle(cliEntryPath, { cwd: _cwd, ...options } = {}) {
     // Original input file path, client path might change later
     const inputFile = cliEntryPath;
     const isFromCli = Boolean(cliEntryPath);
-    let tsConfig = resolveTsConfig(cwd);
+    let tsConfig = resolveTsConfig(cwd, options.tsconfig);
     let hasTsConfig = Boolean(tsConfig == null ? void 0 : tsConfig.tsConfigPath);
     const defaultTsOptions = {
         tsConfigPath: tsConfig == null ? void 0 : tsConfig.tsConfigPath,
@@ -1609,17 +1668,6 @@ async function bundle(cliEntryPath, { cwd: _cwd, ...options } = {}) {
             ].filter(Boolean));
         }
     }
-    const bundleOrWatch = async (rollupConfig)=>{
-        if (options.clean) {
-            if (!isFromCli) {
-                await removeOutputDir(rollupConfig.output, cwd);
-            }
-        }
-        if (options.watch) {
-            return runWatch(rollupConfig);
-        }
-        return runBundle(rollupConfig);
-    };
     const hasSpecifiedEntryFile = cliEntryPath ? fs__default.default.existsSync(cliEntryPath) && (await fsp__default.default.stat(cliEntryPath)).isFile() : false;
     const hasNoEntry = !hasSpecifiedEntryFile && !isMultiEntries && !hasBin;
     if (hasNoEntry) {
@@ -1663,34 +1711,21 @@ async function bundle(cliEntryPath, { cwd: _cwd, ...options } = {}) {
             entriesAlias
         }
     };
-    const assetsJobs = (await buildEntryConfig(options, buildContext, false)).map((rollupConfig)=>bundleOrWatch(rollupConfig));
-    const typesJobs = hasTsConfig && options.dts !== false ? (await buildEntryConfig(options, buildContext, true)).map((rollupConfig)=>bundleOrWatch(rollupConfig)) : [];
-    const totalJobs = assetsJobs.concat(typesJobs);
-    const result = await Promise.all(totalJobs);
-    if (result.length === 0) {
+    const generateTypes = hasTsConfig && options.dts !== false;
+    const rollupJobsOptions = {
+        isFromCli,
+        generateTypes
+    };
+    const assetJobs = await createAssetRollupJobs(options, buildContext, rollupJobsOptions);
+    if (assetJobs.length === 0) {
         logger.warn('The "src" directory does not contain any entry files. ' + 'For proper usage, please refer to the following link: ' + 'https://github.com/huozhi/bunchee#usage');
     }
-    if (!options.watch) {
-        logOutputState(sizeCollector);
+    if (options.watch) {
+        logWatcherBuildTime(assetJobs);
     } else {
-        logWatcherBuildTime(result);
+        logOutputState(sizeCollector);
     }
-    return result;
-}
-function runWatch({ input, output }) {
-    const watchOptions = [
-        {
-            ...input,
-            output: output,
-            watch: {
-                exclude: [
-                    'node_modules/**'
-                ]
-            }
-        }
-    ];
-    const watcher = rollup.watch(watchOptions);
-    return watcher;
+    return;
 }
 function logWatcherBuildTime(result) {
     let watcherCounter = 0;
@@ -1727,15 +1762,6 @@ function logWatcherBuildTime(result) {
         });
     });
 }
-async function removeOutputDir(output, cwd) {
-    const dir = output.dir;
-    if (dir && dir !== cwd) await removeDir(dir);
-}
-function runBundle({ input, output }) {
-    return rollup.rollup(input).then((bundle)=>{
-        return bundle.write(output);
-    }, catchErrorHandler);
-}
 function logError(error) {
     if (!error) return;
     // logging source code in format
@@ -1743,13 +1769,5 @@ function logError(error) {
         process.stderr.write(error.frame + '\n');
     }
 }
-function catchErrorHandler(error) {
-    if (!error) return;
-    logError(error);
-    // filter out the rollup plugin error information such as loc/frame/code...
-    const err = new Error(error.message);
-    err.stack = error.stack;
-    throw err;
-}
 
 exports.bundle = bundle;

package/package.json

@@ -1,10 +1,22 @@
 {
   "name": "bunchee",
-  "version": "5.0.0-beta.3",
+  "version": "5.0.0-beta.5",
   "description": "zero config bundler for js/ts/jsx libraries",
   "bin": "./dist/bin/cli.js",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
+  "scripts": {
+    "test": "jest --env node",
+    "test:update": "TEST_UPDATE_SNAPSHOT=1 pnpm test",
+    "test:post": "POST_BUILD=1 pnpm jest test/compile.test.ts test/integration.test.ts",
+    "clean": "rm -rf ./dist",
+    "typecheck": "tsc --noEmit && tsc -p test/tsconfig.json --noEmit",
+    "prepublishOnly": "pnpm clean && pnpm build && chmod +x ./dist/bin/cli.js && pnpm test",
+    "tsx": "node -r @swc-node/register",
+    "build": "node -r @swc-node/register ./src/bin/index.ts --runtime node",
+    "format": "prettier --write .",
+    "prepare": "husky install"
+  },
   "type": "commonjs",
   "keywords": [
     "bundler",
@@ -42,14 +54,14 @@
     "@rollup/plugin-replace": "^5.0.5",
     "@rollup/plugin-wasm": "^6.2.2",
     "@rollup/pluginutils": "^5.1.0",
-    "@swc/core": "^1.3.106",
-    "@swc/helpers": "^0.5.3",
+    "@swc/core": "^1.4.8",
+    "@swc/helpers": "^0.5.6",
     "arg": "^5.0.2",
     "clean-css": "^5.3.3",
-    "magic-string": "^0.30.6",
+    "magic-string": "^0.30.8",
     "pretty-bytes": "^5.6.0",
     "rimraf": "^5.0.5",
-    "rollup": "^4.12.0",
+    "rollup": "^4.13.0",
     "rollup-plugin-dts": "^6.1.0",
     "rollup-plugin-swc3": "^0.11.0",
     "rollup-preserve-directives": "^1.1.1",
@@ -68,6 +80,7 @@
   },
   "devDependencies": {
     "@huozhi/testing-package": "1.0.0",
+    "@swc-node/register": "^1.9.0",
     "@swc/jest": "^0.2.31",
     "@swc/types": "^0.1.5",
     "@types/clean-css": "^4.2.11",
@@ -80,7 +93,6 @@
     "picocolors": "^1.0.0",
     "prettier": "^3.0.0",
     "react": "^18.2.0",
-    "tsx": "^4.6.2",
     "typescript": "^5.3.2"
   },
   "lint-staged": {
@@ -104,14 +116,5 @@
     ],
     "testTimeout": 60000
   },
-  "packageManager": "pnpm@8.8.0",
-  "scripts": {
-    "test": "jest --env node",
-    "test:update": "TEST_UPDATE_SNAPSHOT=1 pnpm test",
-    "test:post": "POST_BUILD=1 pnpm jest test/compile.test.ts test/integration.test.ts",
-    "clean": "rm -rf ./dist",
-    "typecheck": "tsc --noEmit && tsc -p test/tsconfig.json --noEmit",
-    "build": "tsx ./src/bin/index.ts --runtime node",
-    "format": "prettier --write ."
-  }
-}
+  "packageManager": "pnpm@8.8.0"
+}