bunchee 5.0.0-beta.4 → 5.0.0-beta.6

package/dist/bin/cli.js

@@ -456,7 +456,7 @@ function lint$1(pkg) {
     }
 }
 
-var version = "5.0.0-beta.4";
+var version = "5.0.0-beta.6";
 
 function relativify(path) {
     return path.startsWith('.') ? path : `./${path}`;

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);
@@ -261,10 +249,10 @@ const getMainFieldExportType = (pkg)=>{
 // TODO: add unit test
 const baseNameWithoutExtension = (filename)=>path__default.default.basename(filename, path__default.default.extname(filename));
 const isTestFile = (filename)=>/\.(test|spec)$/.test(baseNameWithoutExtension(filename));
-const memoize = (fn, resolver)=>{
+const memoize = (fn, cacheKey)=>{
     const cache = new Map();
     return (...args)=>{
-        const key = resolver ? resolver(...args) : JSON.stringify({
+        const key = cacheKey ? typeof cacheKey === 'function' ? cacheKey(...args) : cacheKey : JSON.stringify({
             args
         });
         const existing = cache.get(key);
@@ -276,6 +264,7 @@ const memoize = (fn, resolver)=>{
         return result;
     };
 };
+const memoizeByKey = (fn)=>(cacheKey)=>memoize(fn, cacheKey);
 function joinRelativePath(...segments) {
     let result = path__default.default.join(...segments);
     // If the first segment starts with '.', ensure the result does too.
@@ -287,9 +276,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 +313,12 @@ function resolveTypescriptHandler(cwd) {
     }
     return ts;
 }
-const resolveTypescript = memoize(resolveTypescriptHandler);
 function resolveTsConfigHandler(cwd, tsconfig = 'tsconfig.json') {
     let tsCompilerOptions = {};
     let tsConfigPath;
     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 +333,7 @@ function resolveTsConfigHandler(cwd, tsconfig = 'tsconfig.json') {
 }
 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, './');
 }
@@ -1042,6 +1052,44 @@ const swcMinifyOptions = {
         toplevel: true
     }
 };
+async function createDtsPlugin(tsCompilerOptions, tsConfigPath, cwd) {
+    const enableIncrementalWithoutBuildInfo = tsCompilerOptions.incremental && !tsCompilerOptions.tsBuildInfoFile;
+    const incrementalOptions = enableIncrementalWithoutBuildInfo ? {
+        incremental: false
+    } : undefined;
+    const compositeOptions = tsCompilerOptions.composite ? {
+        composite: false
+    } : undefined;
+    const { options: overrideResolvedTsOptions } = await convertCompilerOptions(cwd, {
+        declaration: true,
+        noEmit: false,
+        noEmitOnError: true,
+        emitDeclarationOnly: true,
+        checkJs: false,
+        declarationMap: false,
+        skipLibCheck: true,
+        // preserveSymlinks should always be set to false to avoid issues with
+        // resolving types from <reference> from node_modules
+        preserveSymlinks: false,
+        target: 'ESNext',
+        ...!tsCompilerOptions.jsx ? {
+            jsx: 'react-jsx'
+        } : undefined,
+        // error TS5074: Option '--incremental' can only be specified using tsconfig, emitting to single
+        // file or when option '--tsBuildInfoFile' is specified.
+        ...incrementalOptions,
+        // error TS6379: Composite projects may not disable incremental compilation.
+        ...compositeOptions
+    });
+    const dtsPlugin = require('rollup-plugin-dts').default({
+        tsconfig: tsConfigPath,
+        compilerOptions: overrideResolvedTsOptions
+    });
+    return dtsPlugin;
+}
+// Avoid create multiple dts plugins instance and parsing the same tsconfig multi times,
+// This will avoid memory leak and performance issue.
+const memoizeDtsPluginByKey = memoizeByKey(createDtsPlugin);
 /**
  * return {
  *   <absolute source path>: <pkg>/<export>
@@ -1125,38 +1173,11 @@ async function buildInputConfig(entry, bundleConfig, exportCondition, buildConte
         })
     ];
     if (useTypeScript) {
-        const enableIncrementalWithoutBuildInfo = tsCompilerOptions.incremental && !tsCompilerOptions.tsBuildInfoFile;
-        const incrementalOptions = enableIncrementalWithoutBuildInfo ? {
-            incremental: false
-        } : undefined;
-        const compositeOptions = tsCompilerOptions.composite ? {
-            composite: false
-        } : undefined;
-        const { options: overrideResolvedTsOptions } = await convertCompilerOptions(cwd, {
-            declaration: true,
-            noEmit: false,
-            noEmitOnError: true,
-            emitDeclarationOnly: true,
-            checkJs: false,
-            declarationMap: false,
-            skipLibCheck: true,
-            // preserveSymlinks should always be set to false to avoid issues with
-            // resolving types from <reference> from node_modules
-            preserveSymlinks: false,
-            target: 'ESNext',
-            ...!tsCompilerOptions.jsx ? {
-                jsx: 'react-jsx'
-            } : undefined,
-            // error TS5074: Option '--incremental' can only be specified using tsconfig, emitting to single
-            // file or when option '--tsBuildInfoFile' is specified.
-            ...incrementalOptions,
-            // error TS6379: Composite projects may not disable incremental compilation.
-            ...compositeOptions
-        });
-        const dtsPlugin = require('rollup-plugin-dts').default({
-            tsconfig: tsConfigPath,
-            compilerOptions: overrideResolvedTsOptions
-        });
+        // Each process should be unique
+        // Each package build should be unique
+        // Composing above factors into a unique cache key to retrieve the memoized dts plugin with tsconfigs
+        const uniqueProcessId = 'dts-plugin:' + process.pid + (buildContext.pkg.name || '');
+        const dtsPlugin = await memoizeDtsPluginByKey(uniqueProcessId)(tsCompilerOptions, tsConfigPath, cwd);
         typesPlugins.push(dtsPlugin);
     }
     const plugins = (dts ? typesPlugins : [
@@ -1472,6 +1493,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 +1576,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;
@@ -1609,17 +1680,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 +1723,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 +1774,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 +1781,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,6 +1,6 @@
 {
   "name": "bunchee",
-  "version": "5.0.0-beta.4",
+  "version": "5.0.0-beta.6",
   "description": "zero config bundler for js/ts/jsx libraries",
   "bin": "./dist/bin/cli.js",
   "main": "./dist/index.js",
@@ -12,7 +12,8 @@
     "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",
-    "build": "tsx ./src/bin/index.ts --runtime node",
+    "tsx": "node -r @swc-node/register",
+    "build": "node -r @swc-node/register ./src/bin/index.ts --runtime node",
     "format": "prettier --write .",
     "prepare": "husky install"
   },
@@ -53,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",
@@ -79,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",
@@ -91,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": {