bunchee 5.2.1 → 5.2.2

package/dist/bin/cli.js

@@ -470,7 +470,7 @@ function lint$1(pkg) {
     }
 }
 
-var version = "5.2.1";
+var version = "5.2.2";
 
 function relativify(path) {
     return path.startsWith('.') ? path : `./${path}`;

package/dist/index.js

@@ -608,10 +608,6 @@ 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)=>{
@@ -623,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 -> .
@@ -1085,14 +1090,19 @@ function rawContent({ exclude }) {
     };
 }
 
+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 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;
+    const isMatchedConditionWithFormat = conditionNames.has(specialCondition) || !conditionNames.has('default') && hasNoSpecialCondition(conditionNames);
+    return isMatchedConditionWithFormat && !isTypesCondName && hasBundle && isMatchedFormat;
 }
 function findTypesFileCallback({ format, bundlePath, conditionNames }) {
     const hasCondition = bundlePath != null;
@@ -1101,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])=>({
@@ -1129,8 +1140,9 @@ function aliasEntries({ entry: sourceFilePath, entries, format, dts, cwd }) {
             }
         } else {
             var _exportMapEntries_find2;
-            const specialCondition = getSpecialExportTypeFromSourcePath(sourceFilePath);
-            matchedBundlePath = (_exportMapEntries_find2 = exportMapEntries.find((item)=>findJsBundlePathCallback(item, specialCondition))) == 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);
@@ -1356,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.1",
+  "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"