bunchee 5.2.0-beta.1 → 5.2.1

package/README.md

@@ -252,7 +252,7 @@ Then when the library is integrated to an app such as Next.js, app bundler can t
 If you're using `"use client"` or `"use server"` in entry file, then it will be preserved on top and the dist file of that entry will become a client component.
 If you're using `"use client"` or `"use server"` in a file that used as a dependency for an entry, then that file containing directives be split into a separate chunk and hoist the directives to the top of the chunk.
 
-### Shared Modules
+### Shared Modules (Experimental)
 
 There're always cases that you need to share code among bundles but they don't have to be a separate entry or exports. You want to have them bundled into a shared chunk and then use them in different bundles. You can use shared module convention `[name].[layer]-runtime.[ext]` to create shared modules bundles.
 

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.1";
 
 function relativify(path) {
     return path.startsWith('.') ? path : `./${path}`;
@@ -1025,25 +1018,42 @@ async function run(args) {
     // lint package
     await lint(cwd);
     const { default: ora } = await import('ora');
-    const spinner = ora({
-        text: 'Building...\n',
+    const oraInstance = ora({
+        text: 'Building...\n\n',
         color: 'green'
     });
-    function stopSpinner() {
-        if (spinner.isSpinning) {
-            spinner.stop();
+    const spinner = {
+        start: startSpinner,
+        stop: stopSpinner
+    };
+    function startSpinner() {
+        oraInstance.start();
+    }
+    function stopSpinner(text) {
+        if (oraInstance.isSpinning) {
+            oraInstance.clear();
+            if (text) {
+                oraInstance.stopAndPersist({
+                    symbol: '✔',
+                    text
+                });
+            } else {
+                oraInstance.stop();
+            }
         }
     }
     let initialBuildContext;
     function onBuildStart(buildContext) {
         initialBuildContext = buildContext;
+        if (!watch) {
+            spinner.start();
+        }
     }
     function onBuildEnd(assetJobs) {
+        // Stop spinner before logging output files and sizes on build end
         if (watch) {
-            logWatcherBuildTime(assetJobs);
+            logWatcherBuildTime(assetJobs, spinner);
         } 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 +1068,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',
@@ -1081,12 +1092,10 @@ async function run(args) {
     }
     // watching mode
     if (watch) {
-        logger.log(`Watching project ${cwd}...`);
-        return;
+        spinner.stop();
+    } else {
+        spinner.stop(`bunchee ${version} build completed`);
     }
-    // build mode
-    logger.log();
-    paint('✓', 'green', `bunchee ${version} build completed`);
 }
 async function main() {
     let params, error;
@@ -1101,24 +1110,28 @@ async function main() {
     }
     await run(params);
 }
-function logWatcherBuildTime(result) {
+function logWatcherBuildTime(result, spinner) {
     let watcherCounter = 0;
     let startTime = 0;
     result.map((watcher)=>{
         function start() {
-            if (watcherCounter === 0) startTime = perf_hooks.performance.now();
+            if (watcherCounter === 0) {
+                startTime = perf_hooks.performance.now();
+                spinner.start();
+            }
             watcherCounter++;
         }
         function end() {
             watcherCounter--;
             if (watcherCounter === 0) {
-                logger.info(`Build in ${(perf_hooks.performance.now() - startTime).toFixed(2)}ms`);
+                spinner.stop(`Built in ${(perf_hooks.performance.now() - startTime).toFixed(2)}ms`);
             }
         }
         watcher.on('event', (event)=>{
             switch(event.code){
                 case 'ERROR':
                     {
+                        spinner.stop();
                         logError(event.error);
                         break;
                     }

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;
             }
@@ -596,6 +608,10 @@ function getSpecialExportTypeFromComposedExportPath(composedExportType) {
     }
     return 'default';
 }
+function getSpecialExportTypeFromSourcePath(sourcePath) {
+    const fileBaseName = baseNameWithoutExtension(sourcePath);
+    return getSpecialExportTypeFromComposedExportPath(fileBaseName);
+}
 function getExportTypeFromExportTypesArray(types) {
     let exportType = 'default';
     new Set(types).forEach((value)=>{
@@ -1069,12 +1085,14 @@ function rawContent({ exclude }) {
     };
 }
 
-function findJsBundlePathCallback({ format, bundlePath, conditionNames }) {
-    const hasCondition = bundlePath != null;
+function findJsBundlePathCallback({ format, bundlePath, conditionNames }, specialCondition) {
+    const hasBundle = bundlePath != null;
     const formatCond = format === 'cjs' ? 'require' : 'import';
     const isTypesCondName = conditionNames.has('types');
-    const isMatchedFormat = conditionNames.has(formatCond);
-    return isMatchedFormat && !isTypesCondName && hasCondition;
+    const hasFormatCond = conditionNames.has('import') || conditionNames.has('require');
+    const isMatchedFormat = hasFormatCond ? conditionNames.has(formatCond) : true;
+    const isMatchedConditionWithFormat = specialCondition !== 'default' ? conditionNames.has(specialCondition) || isMatchedFormat : isMatchedFormat;
+    return isMatchedConditionWithFormat && !isTypesCondName && hasBundle;
 }
 function findTypesFileCallback({ format, bundlePath, conditionNames }) {
     const hasCondition = bundlePath != null;
@@ -1111,7 +1129,8 @@ function aliasEntries({ entry: sourceFilePath, entries, format, dts, cwd }) {
             }
         } else {
             var _exportMapEntries_find2;
-            matchedBundlePath = (_exportMapEntries_find2 = exportMapEntries.find(findJsBundlePathCallback)) == null ? void 0 : _exportMapEntries_find2.bundlePath;
+            const specialCondition = getSpecialExportTypeFromSourcePath(sourceFilePath);
+            matchedBundlePath = (_exportMapEntries_find2 = exportMapEntries.find((item)=>findJsBundlePathCallback(item, specialCondition))) == null ? void 0 : _exportMapEntries_find2.bundlePath;
         }
         if (matchedBundlePath) {
             if (!sourceToRelativeBundleMap.has(exportCondition.source)) sourceToRelativeBundleMap.set(exportCondition.source, matchedBundlePath);
@@ -1125,9 +1144,9 @@ function aliasEntries({ entry: sourceFilePath, entries, format, dts, cwd }) {
                 if (resolved != null) {
                     // For types, generate relative path to the other type files,
                     // this will be compatible for the node10 ts module resolution.
-                    const srcBundle = sourceToRelativeBundleMap.get(sourceFilePath);
+                    let srcBundle = sourceToRelativeBundleMap.get(sourceFilePath);
                     // Resolved module bundle path
-                    const resolvedModuleBundle = sourceToRelativeBundleMap.get(resolved.id);
+                    let resolvedModuleBundle = sourceToRelativeBundleMap.get(resolved.id);
                     if (resolved.id !== sourceFilePath && srcBundle && resolvedModuleBundle) {
                         const absoluteBundlePath = path__default.default.resolve(cwd, srcBundle);
                         const absoluteImportBundlePath = path__default.default.resolve(cwd, resolvedModuleBundle);

package/package.json

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