bunchee 5.2.0 → 5.2.2

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

@@ -470,7 +470,7 @@ function lint$1(pkg) {
     }
 }
 
-var version = "5.2.0";
+var version = "5.2.2";
 
 function relativify(path) {
     return path.startsWith('.') ? path : `./${path}`;
@@ -1018,34 +1018,41 @@ async function run(args) {
     // lint package
     await lint(cwd);
     const { default: ora } = await import('ora');
-    const spinner = ora({
+    const oraInstance = ora({
         text: 'Building...\n\n',
         color: 'green'
     });
+    const spinner = {
+        start: startSpinner,
+        stop: stopSpinner
+    };
+    function startSpinner() {
+        oraInstance.start();
+    }
     function stopSpinner(text) {
-        if (spinner.isSpinning) {
-            spinner.clear();
-            console.log();
+        if (oraInstance.isSpinning) {
+            oraInstance.clear();
             if (text) {
-                spinner.stopAndPersist({
+                oraInstance.stopAndPersist({
                     symbol: '✔',
                     text
                 });
             } else {
-                spinner.stop();
+                oraInstance.stop();
             }
         }
     }
     let initialBuildContext;
     function onBuildStart(buildContext) {
         initialBuildContext = buildContext;
-        spinner.start();
+        if (!watch) {
+            spinner.start();
+        }
     }
     function onBuildEnd(assetJobs) {
         // Stop spinner before logging output files and sizes on build end
         if (watch) {
-            stopSpinner('');
-            logWatcherBuildTime(assetJobs);
+            logWatcherBuildTime(assetJobs, spinner);
         } else {
             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');
@@ -1084,8 +1091,10 @@ async function run(args) {
         }
     }
     // watching mode
-    if (!watch) {
-        stopSpinner(`bunchee ${version} build completed`);
+    if (watch) {
+        spinner.stop();
+    } else {
+        spinner.stop(`bunchee ${version} build completed`);
     }
 }
 async function main() {
@@ -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(`Built 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

@@ -619,6 +619,15 @@ function getExportTypeFromExportTypesArray(types) {
     });
     return exportType;
 }
+function getSpecialExportTypeFromConditionNames(conditionNames) {
+    let exportType = 'default';
+    conditionNames.forEach((value)=>{
+        if (specialExportConventions.has(value)) {
+            exportType = value;
+        }
+    });
+    return exportType;
+}
 // ./index -> .
 // ./index.development -> .
 // ./index.react-server -> .
@@ -1081,12 +1090,19 @@ function rawContent({ exclude }) {
     };
 }
 
-function findJsBundlePathCallback({ format, bundlePath, conditionNames }) {
-    const hasCondition = bundlePath != null;
+function hasNoSpecialCondition(conditionNames) {
+    return [
+        ...conditionNames
+    ].every((name)=>!specialExportConventions.has(name));
+}
+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 = conditionNames.has(specialCondition) || !conditionNames.has('default') && hasNoSpecialCondition(conditionNames);
+    return isMatchedConditionWithFormat && !isTypesCondName && hasBundle && isMatchedFormat;
 }
 function findTypesFileCallback({ format, bundlePath, conditionNames }) {
     const hasCondition = bundlePath != null;
@@ -1095,9 +1111,10 @@ function findTypesFileCallback({ format, bundlePath, conditionNames }) {
     return isTypesCondName && hasCondition && (formatCond ? conditionNames.has(formatCond) : true);
 }
 // Alias entry key to dist bundle path
-function aliasEntries({ entry: sourceFilePath, entries, format, dts, cwd }) {
+function aliasEntries({ entry: sourceFilePath, conditionNames, entries, format, dts, cwd }) {
     // <imported source file path>: <relative path to source's bundle>
     const sourceToRelativeBundleMap = new Map();
+    const specialCondition = getSpecialExportTypeFromConditionNames(conditionNames);
     for (const [, exportCondition] of Object.entries(entries)){
         const exportDistMaps = exportCondition.export;
         const exportMapEntries = Object.entries(exportDistMaps).map(([composedKey, bundlePath])=>({
@@ -1123,7 +1140,9 @@ function aliasEntries({ entry: sourceFilePath, entries, format, dts, cwd }) {
             }
         } else {
             var _exportMapEntries_find2;
-            matchedBundlePath = (_exportMapEntries_find2 = exportMapEntries.find(findJsBundlePathCallback)) == null ? void 0 : _exportMapEntries_find2.bundlePath;
+            matchedBundlePath = (_exportMapEntries_find2 = exportMapEntries.find((item)=>{
+                return findJsBundlePathCallback(item, specialCondition);
+            })) == null ? void 0 : _exportMapEntries_find2.bundlePath;
         }
         if (matchedBundlePath) {
             if (!sourceToRelativeBundleMap.has(exportCondition.source)) sourceToRelativeBundleMap.set(exportCondition.source, matchedBundlePath);
@@ -1137,9 +1156,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);
@@ -1349,10 +1368,12 @@ async function buildInputConfig(entry, bundleConfig, exportCondition, buildConte
     // common plugins for both dts and ts assets that need to be processed
     // If it's a .d.ts file under non-ESM package or .d.cts file, use cjs types alias.
     const aliasFormat = dts ? ((_bundleConfig_file = bundleConfig.file) == null ? void 0 : _bundleConfig_file.endsWith('.d.cts')) || ((_bundleConfig_file1 = bundleConfig.file) == null ? void 0 : _bundleConfig_file1.endsWith('.d.ts')) && !isESModulePackage(pkg.type) ? 'cjs' : 'esm' : bundleConfig.format;
+    const currentConditionNames = Object.keys(exportCondition.export)[0];
     const aliasPlugin = aliasEntries({
         entry,
         entries,
         format: aliasFormat,
+        conditionNames: new Set(currentConditionNames.split('.')),
         dts,
         cwd
     });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bunchee",
-  "version": "5.2.0",
+  "version": "5.2.2",
   "description": "zero config bundler for js/ts/jsx libraries",
   "bin": "./dist/bin/cli.js",
   "main": "./dist/index.js",
@@ -42,7 +42,7 @@
     "@rollup/plugin-replace": "^5.0.5",
     "@rollup/plugin-wasm": "^6.2.2",
     "@rollup/pluginutils": "^5.1.0",
-    "@swc/core": "^1.4.17",
+    "@swc/core": "^1.6.1",
     "@swc/helpers": "^0.5.11",
     "arg": "^5.0.2",
     "clean-css": "^5.3.3",
@@ -81,7 +81,7 @@
     "picocolors": "^1.0.0",
     "prettier": "^3.0.0",
     "react": "^18.2.0",
-    "typescript": "^5.3.2"
+    "typescript": "^5.5.2"
   },
   "lint-staged": {
     "*.{js,jsx,ts,tsx,md,json,yml,yaml}": "prettier --write"