bunchee 4.4.2 → 4.4.3

package/dist/bin/cli.js

@@ -161,7 +161,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 +382,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,7 +553,7 @@ function lint$1(pkg) {
     }
 }
 
-var version = "4.4.2";
+var version = "4.4.3";
 
 function relativify(path) {
     return path.startsWith('.') ? path : `./${path}`;
@@ -888,7 +888,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,6 +4,7 @@ var rollup = require('rollup');
 var fsp = require('fs/promises');
 var fs = require('fs');
 var path = require('path');
+var perf_hooks = require('perf_hooks');
 var require$$0 = require('tty');
 var module$1 = require('module');
 var rimraf = require('rimraf');
@@ -461,7 +462,7 @@ function prependDirectives() {
     };
 }
 
-function getTypings(pkg) {
+function getPackageTypings(pkg) {
     return pkg.types || pkg.typings;
 }
 // Reached the end of the export path
@@ -682,7 +683,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 +713,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 +789,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 +809,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 +846,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);
@@ -894,7 +898,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 +937,7 @@ async function buildInputConfig(entry, bundleConfig, exportCondition, buildConte
         preserveDirectives__default.default(),
         prependDirectives(),
         replace__default.default({
-            values: envValues,
+            values: inlineDefinedValues,
             preventAssignment: true
         }),
         pluginNodeResolve.nodeResolve({
@@ -1503,11 +1507,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);
     };
@@ -1556,12 +1560,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 +1585,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.3",
   "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",