bunchee 5.2.0-beta.1 → 5.2.0

package/dist/bin/cli.js

@@ -133,13 +133,6 @@ const logger = {
         console.log(color('green')('✓'), ...arg);
     }
 };
-function paint(prefix, prefixColor, ...arg) {
-    if (pc.isColorSupported) {
-        console.log(pc[prefixColor](prefix), ...arg);
-    } else {
-        console.log(prefix, ...arg);
-    }
-}
 
 function exit(err) {
     logger.error(err);
@@ -477,7 +470,7 @@ function lint$1(pkg) {
     }
 }
 
-var version = "5.2.0-beta.1";
+var version = "5.2.0";
 
 function relativify(path) {
     return path.startsWith('.') ? path : `./${path}`;
@@ -1026,24 +1019,34 @@ async function run(args) {
     await lint(cwd);
     const { default: ora } = await import('ora');
     const spinner = ora({
-        text: 'Building...\n',
+        text: 'Building...\n\n',
         color: 'green'
     });
-    function stopSpinner() {
+    function stopSpinner(text) {
         if (spinner.isSpinning) {
-            spinner.stop();
+            spinner.clear();
+            console.log();
+            if (text) {
+                spinner.stopAndPersist({
+                    symbol: '✔',
+                    text
+                });
+            } else {
+                spinner.stop();
+            }
         }
     }
     let initialBuildContext;
     function onBuildStart(buildContext) {
         initialBuildContext = buildContext;
+        spinner.start();
     }
     function onBuildEnd(assetJobs) {
+        // Stop spinner before logging output files and sizes on build end
         if (watch) {
+            stopSpinner('');
             logWatcherBuildTime(assetJobs);
         } else {
-            // Stop spinner before logging output files and sizes
-            stopSpinner();
             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');
             }
@@ -1058,11 +1061,12 @@ async function run(args) {
         onBuildStart,
         onBuildEnd
     };
-    spinner.start();
+    if (watch) {
+        logger.log(`Watching project ${cwd}...`);
+    }
     try {
         await index_js.bundle(cliEntry, bundleConfig);
     } catch (err) {
-        stopSpinner();
         if (err.name === 'NOT_EXISTED') {
             buildError = {
                 digest: 'bunchee:not-existed',
@@ -1080,13 +1084,9 @@ async function run(args) {
         }
     }
     // watching mode
-    if (watch) {
-        logger.log(`Watching project ${cwd}...`);
-        return;
+    if (!watch) {
+        stopSpinner(`bunchee ${version} build completed`);
     }
-    // build mode
-    logger.log();
-    paint('✓', 'green', `bunchee ${version} build completed`);
 }
 async function main() {
     let params, error;
@@ -1112,7 +1112,7 @@ function logWatcherBuildTime(result) {
         function end() {
             watcherCounter--;
             if (watcherCounter === 0) {
-                logger.info(`Build in ${(perf_hooks.performance.now() - startTime).toFixed(2)}ms`);
+                logger.info(`Built in ${(perf_hooks.performance.now() - startTime).toFixed(2)}ms`);
             }
         }
         watcher.on('event', (event)=>{

package/dist/index.js

@@ -556,6 +556,18 @@ async function collectEntriesFromParsedExports(cwd, parsedExportsInfo, sourceFil
             }
             // output exports match
             if (matchedExportType === entryExportPathType || !hasSpecialEntry && matchedExportType !== 'default') {
+                // When we dealing with special export conditions, we need to make sure
+                // the outputs won't override the default export output paths.
+                // e.g. We have './index' -> { default: 'index.js', development: 'index.development.js' };
+                // When we generate './index.react-server' -> { 'react-server': 'index.react-server.js' },
+                // Normalize the entryExportPath to './index' first and check if it already exists with output paths.
+                const normalizedEntryExportPath = stripSpecialCondition(entryExportPath);
+                if (// The entry already exists, e.g. normalize './index.react-server' to './index'
+                entries[normalizedEntryExportPath] && // Is special export condition
+                entryExportPathType !== 'default' && // The extracted special condition is not the current loop one.
+                entryExportPathType !== matchedExportType) {
+                    continue;
+                }
                 const exportMap = entries[entryExportPath].export;
                 exportMap[outputComposedExportType] = outputPath;
             }

package/package.json

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