bunchee 4.4.2 → 4.4.4

package/dist/bin/cli.js

@@ -6,6 +6,7 @@ var fsp = require('fs/promises');
 require('rimraf');
 var require$$0 = require('tty');
 var bunchee = require('bunchee');
+require('module');
 
 function _interopDefault (e) { return e && e.__esModule ? e : { default: e }; }
 
@@ -161,7 +162,7 @@ const hasCjsExtension = (filename)=>path__default.default.extname(filename) ===
 const baseNameWithoutExtension = (filename)=>path__default.default.basename(filename, path__default.default.extname(filename));
 const isTestFile = (filename)=>/\.(test|spec)$/.test(baseNameWithoutExtension(filename));
 
-function getTypings(pkg) {
+function getPackageTypings(pkg) {
     return pkg.types || pkg.typings;
 }
 // Reached the end of the export path
@@ -382,7 +383,7 @@ function findExport(exportPath, exportCondition, paths, packageType, currentPath
     const defaultMainExport = constructFullExportCondition({
         ...mainExportCondition,
         module: pkg.module,
-        types: getTypings(pkg)
+        types: getPackageTypings(pkg)
     }, packageType);
     if (!isEsmPackage && ((_pathsMap_ = pathsMap['.']) == null ? void 0 : _pathsMap_['require'])) {
         // pathsMap's exports.require are prioritized.
@@ -553,12 +554,17 @@ function lint$1(pkg) {
     }
 }
 
-var version = "4.4.2";
+var version = "4.4.4";
 
 function relativify(path) {
     return path.startsWith('.') ? path : `./${path}`;
 }
 
+async function writeDefaultTsconfig(tsConfigPath) {
+    await fs.promises.writeFile(tsConfigPath, JSON.stringify(DEFAULT_TS_CONFIG, null, 2), 'utf-8');
+    logger.log(`Detected using TypeScript but tsconfig.json is missing, created a ${pc.blue('tsconfig.json')} for you.`);
+}
+
 // Output with posix style in package.json
 function getDistPath(...subPaths) {
     return `./${DIST}/${subPaths.join('/')}`;
@@ -687,7 +693,7 @@ async function prepare(cwd) {
     let isUsingTs = false;
     // Collect bins and exports entries
     const { bins, exportsEntries } = await collectSourceEntries(sourceFolder);
-    const tsconfigPath = path__default.default.join(cwd, 'tsconfig.json');
+    const tsConfigPath = path__default.default.join(cwd, 'tsconfig.json');
     const sourceFiles = [
         ...exportsEntries.values()
     ].concat([
@@ -696,9 +702,8 @@ async function prepare(cwd) {
     const hasTypeScriptFiles = sourceFiles.some((filename)=>isTypescriptFile(filename));
     if (hasTypeScriptFiles) {
         isUsingTs = true;
-        if (!fs__default.default.existsSync(tsconfigPath)) {
-            await fsp__default.default.writeFile(tsconfigPath, JSON.stringify(DEFAULT_TS_CONFIG, null, 2), 'utf-8');
-            logger.log(`Detected using TypeScript but tsconfig.json is missing, created a ${pc.blue('tsconfig.json')} for you.`);
+        if (!fs__default.default.existsSync(tsConfigPath)) {
+            await writeDefaultTsconfig(tsConfigPath);
         }
     }
     // Configure as ESM package by default if there's no package.json
@@ -888,7 +893,7 @@ async function run(args) {
     }
     // watching mode
     if (watch) {
-        logger.log(`Watching assets in ${cwd}...`);
+        logger.log(`Watching project ${cwd}...`);
         return;
     }
     // build mode

package/dist/index.js

@@ -4,8 +4,9 @@ var rollup = require('rollup');
 var fsp = require('fs/promises');
 var fs = require('fs');
 var path = require('path');
-var require$$0 = require('tty');
+var perf_hooks = require('perf_hooks');
 var module$1 = require('module');
+var require$$0 = require('tty');
 var rimraf = require('rimraf');
 var pluginWasm = require('@rollup/plugin-wasm');
 var rollupPluginSwc3 = require('rollup-plugin-swc3');
@@ -243,9 +244,24 @@ const hasAvailableExtension = (filename)=>availableExtensions.has(path__default.
 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));
+const memoize = (fn, resolver)=>{
+    const cache = new Map();
+    return (...args)=>{
+        const key = resolver ? resolver(...args) : JSON.stringify({
+            args
+        });
+        const existing = cache.get(key);
+        if (existing !== undefined) {
+            return existing;
+        }
+        const result = fn(...args);
+        cache.set(key, result);
+        return result;
+    };
+};
 
 let hasLoggedTsWarning = false;
-function resolveTypescript(cwd) {
+function resolveTypescriptHandler(cwd) {
     let ts;
     const m = new module$1.Module('', undefined);
     m.paths = module$1.Module._nodeModulePaths(cwd);
@@ -260,7 +276,8 @@ function resolveTypescript(cwd) {
     }
     return ts;
 }
-function resolveTsConfig(cwd) {
+const resolveTypescript = memoize(resolveTypescriptHandler);
+function resolveTsConfigHandler(cwd) {
     let tsCompilerOptions = {};
     let tsConfigPath;
     tsConfigPath = path.resolve(cwd, 'tsconfig.json');
@@ -277,10 +294,15 @@ function resolveTsConfig(cwd) {
         tsConfigPath
     };
 }
+const resolveTsConfig = memoize(resolveTsConfigHandler);
 async function convertCompilerOptions(cwd, json) {
     const ts = resolveTypescript(cwd);
     return ts.convertCompilerOptionsFromJson(json, './');
 }
+async function writeDefaultTsconfig(tsConfigPath) {
+    await fs.promises.writeFile(tsConfigPath, JSON.stringify(DEFAULT_TS_CONFIG, null, 2), 'utf-8');
+    logger.log(`Detected using TypeScript but tsconfig.json is missing, created a ${pc.blue('tsconfig.json')} for you.`);
+}
 
 const helpers = {
     cssImport: {
@@ -461,7 +483,7 @@ function prependDirectives() {
     };
 }
 
-function getTypings(pkg) {
+function getPackageTypings(pkg) {
     return pkg.types || pkg.typings;
 }
 // Reached the end of the export path
@@ -682,7 +704,7 @@ function findExport(exportPath, exportCondition, paths, packageType, currentPath
     const defaultMainExport = constructFullExportCondition({
         ...mainExportCondition,
         module: pkg.module,
-        types: getTypings(pkg)
+        types: getPackageTypings(pkg)
     }, packageType);
     if (!isEsmPackage && ((_pathsMap_ = pathsMap['.']) == null ? void 0 : _pathsMap_['require'])) {
         // pathsMap's exports.require are prioritized.
@@ -712,7 +734,7 @@ function constructDefaultExportCondition(value, packageType) {
     const isEsmPackage = isESModulePackage(packageType);
     let exportCondition;
     if (typeof value === 'string') {
-        const types = getTypings(value);
+        const types = getPackageTypings(value);
         exportCondition = {
             [isEsmPackage ? 'import' : 'require']: value,
             ...types && {
@@ -788,7 +810,7 @@ const swcMinifyOptions = {
     }
 };
 // return { 'process.env.<key>': '<value>' }
-function getBuildEnv(envs, parsedExportCondition) {
+function getDefinedInlineVariables(envs, parsedExportCondition) {
     if (!envs.includes('NODE_ENV')) {
         envs.push('NODE_ENV');
     }
@@ -808,6 +830,9 @@ function getBuildEnv(envs, parsedExportCondition) {
     } else if (exportConditionNames.has('production')) {
         envVars['process.env.NODE_ENV'] = JSON.stringify('production');
     }
+    if (exportConditionNames.has('edge-light')) {
+        envVars['EdgeRuntime'] = JSON.stringify('edge-runtime');
+    }
     return envVars;
 }
 /**
@@ -842,7 +867,7 @@ async function buildInputConfig(entry, bundleConfig, exportCondition, buildConte
             externals.push(entryFilePath);
         }
     }
-    const envValues = getBuildEnv(bundleConfig.env || [], exportCondition);
+    const inlineDefinedValues = getDefinedInlineVariables(bundleConfig.env || [], exportCondition);
     const { useTypeScript } = buildContext;
     const { runtime, target: jscTarget, minify: shouldMinify } = bundleConfig;
     const hasSpecifiedTsTarget = Boolean(tsCompilerOptions.target && tsConfigPath);
@@ -874,6 +899,7 @@ async function buildInputConfig(entry, bundleConfig, exportCondition, buildConte
     // common plugins for both dts and ts assets that need to be processed
     const aliasFormat = dts ? ((_bundleConfig_file = bundleConfig.file) == null ? void 0 : _bundleConfig_file.endsWith('.d.cts')) ? 'cjs' : 'esm' : bundleConfig.format;
     const commonPlugins = [
+        json__default.default(),
         sizePlugin,
         aliasEntries({
             entry,
@@ -894,7 +920,7 @@ async function buildInputConfig(entry, bundleConfig, exportCondition, buildConte
         const incrementalOptions = enableIncrementalWithoutBuildInfo ? {
             incremental: false
         } : undefined;
-        const compositeOptions = tsCompilerOptions.composite && enableIncrementalWithoutBuildInfo ? {
+        const compositeOptions = tsCompilerOptions.composite ? {
             composite: false
         } : undefined;
         const { options: overrideResolvedTsOptions } = await convertCompilerOptions(cwd, {
@@ -933,7 +959,7 @@ async function buildInputConfig(entry, bundleConfig, exportCondition, buildConte
         preserveDirectives__default.default(),
         prependDirectives(),
         replace__default.default({
-            values: envValues,
+            values: inlineDefinedValues,
             preventAssignment: true
         }),
         pluginNodeResolve.nodeResolve({
@@ -950,8 +976,7 @@ async function buildInputConfig(entry, bundleConfig, exportCondition, buildConte
         }),
         commonjs__default.default({
             exclude: bundleConfig.external || null
-        }),
-        json__default.default()
+        })
     ]).filter(isNotNull);
     return {
         input: entry,
@@ -1470,7 +1495,7 @@ async function bundle(cliEntryPath, { cwd: _cwd, ...options } = {}) {
     ;
     const hasBin = Boolean(pkg.bin);
     const isFromCli = Boolean(cliEntryPath);
-    let tsConfig = await resolveTsConfig(cwd);
+    let tsConfig = resolveTsConfig(cwd);
     let hasTsConfig = Boolean(tsConfig == null ? void 0 : tsConfig.tsConfigPath);
     const defaultTsOptions = {
         tsConfigPath: tsConfig == null ? void 0 : tsConfig.tsConfigPath,
@@ -1503,11 +1528,11 @@ async function bundle(cliEntryPath, { cwd: _cwd, ...options } = {}) {
     const bundleOrWatch = async (rollupConfig)=>{
         if (options.clean) {
             if (!isFromCli) {
-                await removeOutputDir(rollupConfig.output);
+                await removeOutputDir(rollupConfig.output, cwd);
             }
         }
         if (options.watch) {
-            return Promise.resolve(runWatch(rollupConfig));
+            return runWatch(rollupConfig);
         }
         return runBundle(rollupConfig);
     };
@@ -1532,8 +1557,7 @@ async function bundle(cliEntryPath, { cwd: _cwd, ...options } = {}) {
     if (hasTypeScriptFiles && !hasTsConfig) {
         const tsConfigPath = path.resolve(cwd, 'tsconfig.json');
         defaultTsOptions.tsConfigPath = tsConfigPath;
-        await fsp__default.default.writeFile(tsConfigPath, JSON.stringify(DEFAULT_TS_CONFIG, null, 2), 'utf-8');
-        logger.log(`Detected using TypeScript but tsconfig.json is missing, created a ${pc.blue('tsconfig.json')} for you.`);
+        await writeDefaultTsconfig(tsConfigPath);
         hasTsConfig = true;
     }
     const sizeCollector = createOutputState({
@@ -1556,12 +1580,15 @@ async function bundle(cliEntryPath, { cwd: _cwd, ...options } = {}) {
     const buildConfigs = await buildEntryConfig(options, buildContext, false);
     const assetsJobs = buildConfigs.map((rollupConfig)=>bundleOrWatch(rollupConfig));
     const typesJobs = hasTsConfig ? (await buildEntryConfig(options, buildContext, true)).map((rollupConfig)=>bundleOrWatch(rollupConfig)) : [];
-    const result = await Promise.all(assetsJobs.concat(typesJobs));
+    const totalJobs = assetsJobs.concat(typesJobs);
+    const result = await Promise.all(totalJobs);
     if (result.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);
+    } else {
+        logWatcherBuildTime(result);
     }
     return result;
 }
@@ -1578,29 +1605,45 @@ function runWatch({ input, output }) {
         }
     ];
     const watcher = rollup.watch(watchOptions);
-    watcher.on('event', (event)=>{
-        switch(event.code){
-            case 'ERROR':
-                {
-                    logError(event.error);
-                    break;
-                }
-            case 'START':
-                {
-                    break;
-                }
-            case 'END':
-                {
-                    break;
-                }
-            default:
-                return;
+    return watcher;
+}
+function logWatcherBuildTime(result) {
+    let watcherCounter = 0;
+    let startTime = 0;
+    result.map((watcher)=>{
+        function start() {
+            if (startTime === 0) startTime = perf_hooks.performance.now();
+        }
+        function end() {
+            watcherCounter++;
+            if (watcherCounter === result.length) {
+                logger.info(`Build in ${(perf_hooks.performance.now() - startTime).toFixed(2)}ms`);
+            }
         }
+        watcher.on('event', (event)=>{
+            switch(event.code){
+                case 'ERROR':
+                    {
+                        logError(event.error);
+                        break;
+                    }
+                case 'START':
+                    {
+                        start();
+                        break;
+                    }
+                case 'END':
+                    {
+                        end();
+                        break;
+                    }
+            }
+        });
     });
-    return watcher;
 }
-async function removeOutputDir(output) {
-    if (output.dir) await removeDir(output.dir);
+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)=>{

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bunchee",
-  "version": "4.4.2",
+  "version": "4.4.4",
   "description": "zero config bundler for js/ts/jsx libraries",
   "bin": "./dist/bin/cli.js",
   "main": "./dist/index.js",
@@ -54,7 +54,7 @@
     "@rollup/plugin-replace": "^5.0.5",
     "@rollup/plugin-wasm": "^6.2.2",
     "@rollup/pluginutils": "^5.1.0",
-    "@swc/core": "^1.3.102",
+    "@swc/core": "^1.3.106",
     "@swc/helpers": "^0.5.3",
     "arg": "^5.0.2",
     "clean-css": "^5.3.3",
@@ -79,7 +79,7 @@
   },
   "devDependencies": {
     "@huozhi/testing-package": "1.0.0",
-    "@swc/jest": "^0.2.29",
+    "@swc/jest": "^0.2.31",
     "@swc/types": "^0.1.5",
     "@types/clean-css": "^4.2.11",
     "@types/jest": "29.0.0",
@@ -112,7 +112,8 @@
     "testPathIgnorePatterns": [
       "/node_modules/",
       "<rootDir>/test/integration/.*/*src"
-    ]
+    ],
+    "testTimeout": 8000
   },
   "packageManager": "pnpm@8.8.0"
 }