bunchee 5.6.0 → 6.0.0-beta.0

package/README.md

@@ -44,12 +44,12 @@ mkdir src && touch ./src/index.ts
 
 ```sh
 # Use bunchee to prepare package.json configuration
-npm exec bunchee --prepare
+npm exec bunchee prepare
 # "If you're using other package manager such as pnpm"
-# pnpm bunchee --prepare
+# pnpm bunchee prepare
 
 # "Or use with npx"
-# npx bunchee@latest --prepare
+# npx bunchee@latest prepare
 ```
 
 Or you can checkout the following cases to configure your package.json.
@@ -252,63 +252,65 @@ 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 (Experimental)
+### Shared Modules
 
-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.
+In some cases, you may need to share code across multiple bundles without promoting them to separate entries or exports. These modules should be bundled into shared chunks that can be reused by various bundles. By convention, files or directories prefixed with an underscore (`_<name>.<ext>` or `_<name>/index.<ext>`) are treated as **shared modules**. They're private and not exposed publicly as entry points or exports.
 
 <details>
   <summary>Shared Utils Example</summary>
 
 ```js
-// src/util.shared-runtime.js
+// src/_util.js
 export function sharedUtil() {
   /* ... */
 }
 ```
 
-Then you can use them in different entry files:
+You can then use them in different entry files:
 
 ```js
 // src/index.js
-import { sharedUtil } from './util.shared-runtime'
+import { sharedUtil } from './_util'
 ```
 
 ```js
 // src/lite.js
-import { sharedUtil } from './util.shared-runtime'
+import { sharedUtil } from './_util'
 ```
 
-`bunchee` will bundle the shared module into a separate **layer** which matches the file name convention, in the above case it's "shared", and that bundle will be referenced by the different entry bundles.
+`bunchee` will bundle the shared module into a separate chunk, keeping it private and ensuring it's referenced by multiple entry bundles.
 
 </details>
 
-With multiple runtime bundles, such as having `default` and `react-server` together. They could have the modules that need to be shared and kept as only one instance among different runtime bundles. You can use the shared module convention to create shared modules bundles for different runtime bundles.
+For scenarios involving multiple runtime bundles, such as `default` and `react-server`, modules that need to be shared and remain as a single instance across different runtime bundles can also follow this convention. The leading underscore (`_`) ensures that these modules are private to your application while facilitating reuse.
 
 <details>
   <summary>Shared Runtime Module Example</summary>
 
 ```js
 'use client'
-// src/app-context.shared-runtime.js
+// src/_app-context.js
 export const AppContext = React.createContext(null)
 ```
 
-Then you can use them in different entry files:
+These modules can be imported in various runtime entry files:
 
 ```js
 // src/index.js
-import { AppContext } from './app-context.shared-runtime'
+import { AppContext } from './_app-context'
 ```
 
 ```js
 // src/index.react-server.js
-import { AppContext } from './app-context.shared-runtime'
+import { AppContext } from './_app-context'
 ```
 
-`app-context.shared-runtime` will be bundled into a separate chunk that only has one instance and be shared among different runtime bundles.
+The `_app-context` module will be bundled into a shared chunk that exists as a single instance across different runtime bundles.
 
 </details>
 
+This convention keeps shared modules private while enabling efficient bundling and reuse across your codebase.
+
 ### CLI
 
 #### CLI Options

package/dist/bin/cli.js

@@ -8,6 +8,7 @@ var fsp = require('fs/promises');
 var require$$0 = require('tty');
 var index_js = require('../index.js');
 require('module');
+var glob = require('glob');
 var prettyBytes = require('pretty-bytes');
 
 function _interopDefault (e) { return e && e.__esModule ? e : { default: e }; }
@@ -141,7 +142,7 @@ const logger = {
         console.log(...arg);
     },
     warn (...arg) {
-        console.warn(color('yellow')('⚠️'), ...arg);
+        console.warn(color('yellow')('!'), ...arg);
     },
     error (...arg) {
         console.error(color('red')('⨯'), ...arg);
@@ -151,6 +152,11 @@ const logger = {
     }
 };
 
+const { sep } = require('path');
+function relativify(path) {
+    return path.startsWith('.') ? path : `.${sep}${path}`;
+}
+
 function exit(err) {
     logger.error(err);
     process.exit(1);
@@ -175,8 +181,6 @@ function isTypescriptFile(filename) {
 function fileExists(filePath) {
     return fs__default.default.existsSync(filePath);
 }
-// 'index.server.js' -> 'index'
-const getFileBasename = (str)=>str.split('.')[0];
 const hasCjsExtension = (filename)=>path__default.default.extname(filename) === '.cjs';
 const getMainFieldExportType = (pkg)=>{
     const isEsmPkg = isESModulePackage(pkg.type);
@@ -203,6 +207,16 @@ function isBinExportPath(exportPath) {
 function isTypeFile(filename) {
     return filename.endsWith('.d.ts') || filename.endsWith('.d.mts') || filename.endsWith('.d.cts');
 }
+// shared.ts -> ./shared
+// shared.<export condition>.ts -> ./shared.<export condition>
+// index.ts -> ./index
+// index.development.ts -> ./index.development
+// foo/index.ts -> ./foo
+function sourceFilenameToExportFullPath(filename) {
+    const ext = path__default.default.extname(filename);
+    const exportPath = filename.slice(0, -ext.length);
+    return relativify(exportPath);
+}
 
 function collectExportPath(exportValue, exportKey, currentPath, exportTypes, exportToDist) {
     // End of searching, export value is file path.
@@ -525,26 +539,13 @@ function lint$1(pkg) {
     }
 }
 
-var version = "5.6.0";
-
-function relativify(path) {
-    return path.startsWith('.') ? path : `./${path}`;
-}
+var version = "6.0.0-beta.0";
 
 async function writeDefaultTsconfig(tsConfigPath) {
     await fs.promises.writeFile(tsConfigPath, JSON.stringify(DEFAULT_TS_CONFIG, null, 2), 'utf-8');
     logger.log(`Detected using TypeScript but tsconfig.json is missing, created a ${pc.blue('tsconfig.json')} for you.`);
 }
 
-// shared.ts -> ./shared
-// shared.<export condition>.ts -> ./shared
-// index.ts -> ./index
-// index.development.ts -> ./index.development
-function sourceFilenameToExportFullPath(filename) {
-    const baseName = baseNameWithoutExtension(filename);
-    let exportPath = baseName;
-    return relativify(exportPath);
-}
 // ./index -> default
 // ./index.development -> development
 // ./index.react-server -> react-server
@@ -597,125 +598,98 @@ function normalizeExportPath(exportPath) {
 async function collectSourceEntriesByExportPath(sourceFolderPath, originalSubpath, bins, exportsEntries) {
     const isBinaryPath = isBinExportPath(originalSubpath);
     const subpath = originalSubpath.replace(BINARY_TAG, 'bin');
-    const absoluteDirPath = path__default.default.join(sourceFolderPath, subpath);
-    const isDirectory = fs__default.default.existsSync(absoluteDirPath) ? (await fsp__default.default.stat(absoluteDirPath)).isDirectory() : false;
-    if (isDirectory) {
+    const absoluteDirPath = path.join(sourceFolderPath, subpath);
+    const dirName = path.dirname(subpath) // Get directory name regardless of file/directory
+    ;
+    const baseName = path.basename(subpath) // Get base name regardless of file/directory
+    ;
+    const dirPath = path.join(sourceFolderPath, dirName);
+    // Match <name>{,/index}.{<ext>,<runtime>.<ext>}
+    const globalPatterns = [
+        `${baseName}.{${[
+            ...availableExtensions
+        ].join(',')}}`,
+        `${baseName}.{${[
+            ...runtimeExportConventions
+        ].join(',')}}.{${[
+            ...availableExtensions
+        ].join(',')}}`,
+        `${baseName}/index.{${[
+            ...availableExtensions
+        ].join(',')}}`,
+        `${baseName}/index.{${[
+            ...runtimeExportConventions
+        ].join(',')}}.{${[
+            ...availableExtensions
+        ].join(',')}}`
+    ];
+    const files = await glob.glob(globalPatterns, {
+        cwd: dirPath,
+        nodir: true,
+        ignore: '**/_*'
+    });
+    for (const file of files){
+        const ext = path.extname(file).slice(1);
+        if (!availableExtensions.has(ext) || isTestFile(file)) continue;
+        const sourceFileAbsolutePath = path.join(dirPath, file);
+        const exportPath = relativify(fs.existsSync(absoluteDirPath) && (await fsp__default.default.stat(absoluteDirPath)).isDirectory() ? subpath : originalSubpath);
         if (isBinaryPath) {
-            const binDirentList = await fsp__default.default.readdir(absoluteDirPath, {
-                withFileTypes: true
-            });
-            for (const binDirent of binDirentList){
-                if (binDirent.isFile()) {
-                    const binFileAbsolutePath = path__default.default.join(absoluteDirPath, binDirent.name);
-                    if (fs__default.default.existsSync(binFileAbsolutePath)) {
-                        bins.set(normalizeExportPath(originalSubpath), binFileAbsolutePath);
-                    }
-                }
-            }
+            bins.set(normalizeExportPath(originalSubpath), sourceFileAbsolutePath);
         } else {
-            // Search folder/index.<ext> convention entries
-            for (const extension of availableExtensions){
-                const indexAbsoluteFile = path__default.default.join(absoluteDirPath, `index.${extension}`);
-                // Search folder/index.<special type>.<ext> convention entries
-                for (const specialExportType of runtimeExportConventions){
-                    const indexSpecialAbsoluteFile = path__default.default.join(absoluteDirPath, `index.${specialExportType}.${extension}`);
-                    if (fs__default.default.existsSync(indexSpecialAbsoluteFile)) {
-                        // Add special export path
-                        // { ./<export path>.<special cond>: { <special cond>: 'index.<special cond>.<ext>' } }
-                        const exportPath = relativify(subpath);
-                        const specialExportPath = exportPath + '.' + specialExportType;
-                        const sourceFilesMap = exportsEntries.get(specialExportPath) || {};
-                        sourceFilesMap[specialExportType] = indexSpecialAbsoluteFile;
-                        exportsEntries.set(specialExportPath, sourceFilesMap);
-                    }
-                }
-                if (fs__default.default.existsSync(indexAbsoluteFile) && !isTestFile(indexAbsoluteFile)) {
-                    const exportPath = relativify(subpath);
-                    const sourceFilesMap = exportsEntries.get(exportPath) || {};
-                    const exportType = getExportTypeFromExportPath(exportPath);
-                    sourceFilesMap[exportType] = indexAbsoluteFile;
-                    exportsEntries.set(exportPath, sourceFilesMap);
-                }
-            }
-        }
-    } else {
-        // subpath could be a file
-        const dirName = path.dirname(subpath);
-        const baseName = path.basename(subpath);
-        // Read current file's directory
-        const dirPath = path__default.default.join(sourceFolderPath, dirName);
-        if (!fs__default.default.existsSync(dirPath)) {
-            return;
-        }
-        const dirents = await fsp__default.default.readdir(dirPath, {
-            withFileTypes: true
-        });
-        for (const dirent of dirents){
-            // index.development.js -> index.development
-            const direntBaseName = baseNameWithoutExtension(dirent.name);
-            const ext = path.extname(dirent.name).slice(1);
-            if (!dirent.isFile() || direntBaseName !== baseName || !availableExtensions.has(ext)) {
-                continue;
-            }
-            if (isTestFile(dirent.name)) {
-                continue;
-            }
-            const sourceFileAbsolutePath = path__default.default.join(dirPath, dirent.name);
-            if (isBinaryPath) {
-                bins.set(originalSubpath, sourceFileAbsolutePath);
-            } else {
-                let sourceFilesMap = exportsEntries.get(originalSubpath) || {};
-                const exportType = getExportTypeFromExportPath(originalSubpath);
-                sourceFilesMap[exportType] = sourceFileAbsolutePath;
-                if (specialExportConventions.has(exportType)) {
-                    // e.g. ./foo/index.react-server -> ./foo/index
-                    const fallbackExportPath = sourceFilenameToExportFullPath(originalSubpath);
-                    const fallbackSourceFilesMap = exportsEntries.get(fallbackExportPath) || {};
-                    sourceFilesMap = {
-                        ...fallbackSourceFilesMap,
-                        ...sourceFilesMap
-                    };
-                }
-                exportsEntries.set(originalSubpath, sourceFilesMap);
+            const parts = path.basename(file).split('.');
+            const exportType = parts.length > 2 ? parts[1] : getExportTypeFromExportPath(exportPath);
+            const specialExportPath = exportType !== 'index' && parts.length > 2 ? exportPath + '.' + exportType : exportPath // Adjust for direct file matches
+            ;
+            const sourceFilesMap = exportsEntries.get(specialExportPath) || {};
+            sourceFilesMap[exportType] = sourceFileAbsolutePath;
+            if (specialExportConventions.has(exportType)) {
+                const fallbackExportPath = sourceFilenameToExportFullPath(originalSubpath);
+                const fallbackSourceFilesMap = exportsEntries.get(fallbackExportPath) || {};
+                Object.assign(sourceFilesMap, fallbackSourceFilesMap);
             }
+            exportsEntries.set(specialExportPath, sourceFilesMap);
         }
     }
 }
-// For `prepare`
+
+// For `prepare` command
 async function collectSourceEntries(sourceFolderPath) {
     const bins = new Map();
     const exportsEntries = new Map();
-    if (!fs__default.default.existsSync(sourceFolderPath)) {
+    if (!fs.existsSync(sourceFolderPath)) {
         return {
             bins,
             exportsEntries
         };
     }
-    const entryFileDirentList = await fsp__default.default.readdir(sourceFolderPath, {
-        withFileTypes: true
+    // Match with global patterns
+    // bin/**/*.<ext>, bin/**/index.<ext>
+    const binPattern = `bin/**/*.{${[
+        ...availableExtensions
+    ].join(',')}}`;
+    const srcPattern = `**/*.{${[
+        ...availableExtensions
+    ].join(',')}}`;
+    const binMatches = await glob.glob(binPattern, {
+        cwd: sourceFolderPath,
+        nodir: true,
+        ignore: '**/_*'
     });
-    // Collect source files for `exports` field
-    for (const dirent of entryFileDirentList){
-        if (getFileBasename(dirent.name) === 'bin') {
-            continue;
-        }
-        const exportPath = sourceFilenameToExportFullPath(dirent.name);
-        await collectSourceEntriesByExportPath(sourceFolderPath, exportPath, bins, exportsEntries);
+    const srcMatches = await glob.glob(srcPattern, {
+        cwd: sourceFolderPath,
+        nodir: true,
+        ignore: '**/_*'
+    });
+    for (const file of binMatches){
+        // convert relative path to export path
+        const exportPath = sourceFilenameToExportFullPath(file);
+        const binExportPath = exportPath.replace(/^\.[\//]bin/, BINARY_TAG);
+        await collectSourceEntriesByExportPath(sourceFolderPath, binExportPath, bins, exportsEntries);
     }
-    // Collect source files for `bin` field
-    const binDirent = entryFileDirentList.find((dirent)=>getFileBasename(dirent.name) === 'bin');
-    if (binDirent) {
-        if (binDirent.isDirectory()) {
-            const binDirentList = await fsp__default.default.readdir(path__default.default.join(sourceFolderPath, binDirent.name), {
-                withFileTypes: true
-            });
-            for (const binDirent of binDirentList){
-                const binExportPath = path.posix.join(BINARY_TAG, getFileBasename(binDirent.name));
-                await collectSourceEntriesByExportPath(sourceFolderPath, binExportPath, bins, exportsEntries);
-            }
-        } else {
-            await collectSourceEntriesByExportPath(sourceFolderPath, BINARY_TAG, bins, exportsEntries);
-        }
+    for (const file of srcMatches){
+        const binExportPath = file.replace(/^bin/, BINARY_TAG)// Remove index.<ext> to [^index].<ext> to build the export path
+        .replace(/(\/index)?\.[^/]+$/, '');
+        await collectSourceEntriesByExportPath(sourceFolderPath, binExportPath, bins, exportsEntries);
     }
     return {
         bins,
@@ -955,6 +929,9 @@ function logOutputState(stats) {
 const helpMessage = `
 Usage: bunchee [options]
 
+Commands:
+prepare                  auto configure package.json exports for building
+
 Options:
   -v, --version          output the version number
   -w, --watch            watch src files changes
@@ -962,7 +939,7 @@ Options:
   -o, --output <file>    specify output filename
   -f, --format <format>  type of output (esm, amd, cjs, iife, umd, system), default: esm
   -h, --help             output usage information
-  --prepare              auto configure package.json exports for building
+  
   --external <mod>       specify an external dependency, separate by comma
   --no-external          do not bundle external dependencies
   --no-clean             do not clean dist folder before building, default: false
@@ -986,7 +963,11 @@ async function lint(cwd) {
     await lint$1(await getPackageMeta(cwd));
 }
 async function parseCliArgs(argv) {
-    const args = await yargs__default.default(helpers.hideBin(argv)).option('cwd', {
+    const args = await yargs__default.default(helpers.hideBin(argv)).option('watch', {
+        type: 'boolean',
+        alias: 'w',
+        description: 'watch src files changes'
+    }).option('cwd', {
         type: 'string',
         description: 'specify current working directory'
     }).option('dts', {
@@ -1008,10 +989,6 @@ async function parseCliArgs(argv) {
         alias: 'f',
         default: 'esm',
         description: 'type of output (esm, amd, cjs, iife, umd, system)'
-    }).option('watch', {
-        type: 'boolean',
-        alias: 'w',
-        description: 'watch src files changes'
     }).option('minify', {
         type: 'boolean',
         alias: 'm',
@@ -1039,22 +1016,23 @@ async function parseCliArgs(argv) {
             return typeof arg === 'string' || typeof arg === 'boolean' ? arg : undefined;
         },
         description: 'specify an external dependency, separate by comma'
-    }).option('prepare', {
-        type: 'boolean',
-        description: 'auto configure package.json exports for building'
     }).option('tsconfig', {
         type: 'string',
         description: 'path to tsconfig file'
     }).option('dts-bundle', {
         type: 'boolean',
         description: 'bundle type declaration files'
+    }).command('prepare', 'auto configure package.json exports for building', ()=>{}, (argv)=>{
+        return prepare(argv.cwd || process.cwd());
+    }).command('lint', 'lint package.json', ()=>{}, (argv)=>{
+        return lint(argv.cwd || process.cwd());
     }).version(version).help('help', 'output usage information').showHelpOnFail(true).parse();
     const source = args._[0];
     const parsedArgs = {
         source,
         format: args['format'],
         file: args['output'],
-        watch: args['watch'],
+        watch: !!args['watch'],
         minify: args['minify'],
         sourcemap: !!args['sourcemap'],
         cwd: args['cwd'],
@@ -1067,7 +1045,6 @@ async function parseCliArgs(argv) {
         external: args['external'] === false ? null : args['external'],
         clean: args['clean'] !== false,
         env: args['env'],
-        prepare: !!args['prepare'],
         tsconfig: args['tsconfig']
     };
     return parsedArgs;
@@ -1094,11 +1071,8 @@ async function run(args) {
         clean,
         tsconfig
     };
-    if (args.prepare) {
-        return await prepare(cwd);
-    }
     const cliEntry = source ? path__default.default.resolve(cwd, source) : '';
-    // lint package
+    // lint package by default
     await lint(cwd);
     const { default: ora } = await import('ora');
     const oraInstance = process.stdout.isTTY ? ora({

package/dist/index.js

@@ -4,6 +4,7 @@ var fsp = require('fs/promises');
 var fs = require('fs');
 var path = require('path');
 require('pretty-bytes');
+var glob = require('glob');
 var require$$0 = require('tty');
 var module$1 = require('module');
 var rollup = require('rollup');
@@ -100,7 +101,7 @@ const logger = {
         console.log(...arg);
     },
     warn (...arg) {
-        console.warn(color('yellow')('⚠️'), ...arg);
+        console.warn(color('yellow')('!'), ...arg);
     },
     error (...arg) {
         console.error(color('red')('⨯'), ...arg);
@@ -142,6 +143,67 @@ const runtimeExportConventions = new Set([
     // Browser only
     'browser'
 ]);
+const runtimeExportConventionsFallback = new Map([
+    // ESM only runtime
+    [
+        'workerd',
+        [
+            'import',
+            'default'
+        ]
+    ],
+    [
+        'edge-light',
+        [
+            'import',
+            'default'
+        ]
+    ],
+    [
+        'browser',
+        [
+            'import',
+            'default'
+        ]
+    ],
+    // it could be CJS or ESM
+    [
+        'electron',
+        [
+            'default'
+        ]
+    ],
+    [
+        'react-server',
+        [
+            'default'
+        ]
+    ],
+    [
+        'react-native',
+        [
+            'default'
+        ]
+    ],
+    [
+        'node',
+        [
+            'default'
+        ]
+    ],
+    [
+        'deno',
+        [
+            'default'
+        ]
+    ],
+    [
+        'bun',
+        [
+            'default'
+        ]
+    ]
+]);
 const optimizeConventions = new Set([
     'development',
     'production'
@@ -180,6 +242,11 @@ const DEFAULT_TS_CONFIG = {
 };
 const BINARY_TAG = '$binary';
 
+const { sep } = require('path');
+function relativify(path) {
+    return path.startsWith('.') ? path : `.${sep}${path}`;
+}
+
 function exit(err) {
     logger.error(err);
     process.exit(1);
@@ -245,7 +312,7 @@ async function getSourcePathFromExportPath(cwd, exportPath, exportType) {
 // TODO: add unit test
 // Unlike path.basename, forcedly removing extension
 function filePathWithoutExtension(filePath) {
-    if (!filePath) return;
+    if (!filePath) return '';
     const lastDotIndex = filePath.lastIndexOf('.');
     const lastSlashIndex = filePath.lastIndexOf('/');
     if (lastDotIndex !== -1 && lastDotIndex > lastSlashIndex) {
@@ -301,6 +368,16 @@ async function removeOutputDir(output, cwd) {
 function isBinExportPath(exportPath) {
     return exportPath === BINARY_TAG || exportPath.startsWith(BINARY_TAG + '/');
 }
+// shared.ts -> ./shared
+// shared.<export condition>.ts -> ./shared.<export condition>
+// index.ts -> ./index
+// index.development.ts -> ./index.development
+// foo/index.ts -> ./foo
+function sourceFilenameToExportFullPath(filename) {
+    const ext = path__default.default.extname(filename);
+    const exportPath = filename.slice(0, -ext.length);
+    return relativify(exportPath);
+}
 
 function collectExportPath(exportValue, exportKey, currentPath, exportTypes, exportToDist) {
     // End of searching, export value is file path.
@@ -442,7 +519,8 @@ function addToExportDistMap(exportToDist, exportPath, outputConditionPairs, spec
 function isEsmExportName(name, ext) {
     return [
         'import',
-        'module'
+        'module',
+        'module-sync'
     ].includes(name) || ext === 'mjs';
 }
 function isCjsExportName(pkg, exportCondition, ext) {
@@ -503,20 +581,7 @@ function getExportTypeFromFile(filename, pkgType) {
     return exportType;
 }
 
-function relativify(path) {
-    return path.startsWith('.') ? path : `./${path}`;
-}
-
-// shared.ts -> ./shared
-// shared.<export condition>.ts -> ./shared
-// index.ts -> ./index
-// index.development.ts -> ./index.development
-function sourceFilenameToExportFullPath(filename) {
-    const baseName = baseNameWithoutExtension(filename);
-    let exportPath = baseName;
-    return relativify(exportPath);
-}
-async function collectEntriesFromParsedExports(cwd, parsedExportsInfo, sourceFile) {
+async function collectEntriesFromParsedExports(cwd, parsedExportsInfo, pkg, sourceFile) {
     const entries = {};
     if (sourceFile) {
         const defaultExport = parsedExportsInfo.get('./index')[0];
@@ -529,7 +594,7 @@ async function collectEntriesFromParsedExports(cwd, parsedExportsInfo, sourceFil
         };
     }
     // Find source files
-    const { bins, exportsEntries } = await collectSourceEntriesFromExportPaths(path.join(cwd, SRC), parsedExportsInfo);
+    const { bins, exportsEntries } = await collectSourceEntriesFromExportPaths(path.join(cwd, SRC), parsedExportsInfo, pkg);
     // A mapping between each export path and its related special export conditions,
     // excluding the 'default' export condition.
     // { './index' => Set('development', 'edge-light') }
@@ -626,6 +691,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)=>{
@@ -674,87 +743,56 @@ function stripSpecialCondition(exportPath) {
 async function collectSourceEntriesByExportPath(sourceFolderPath, originalSubpath, bins, exportsEntries) {
     const isBinaryPath = isBinExportPath(originalSubpath);
     const subpath = originalSubpath.replace(BINARY_TAG, 'bin');
-    const absoluteDirPath = path__default.default.join(sourceFolderPath, subpath);
-    const isDirectory = fs__default.default.existsSync(absoluteDirPath) ? (await fsp__default.default.stat(absoluteDirPath)).isDirectory() : false;
-    if (isDirectory) {
+    const absoluteDirPath = path.join(sourceFolderPath, subpath);
+    const dirName = path.dirname(subpath) // Get directory name regardless of file/directory
+    ;
+    const baseName = path.basename(subpath) // Get base name regardless of file/directory
+    ;
+    const dirPath = path.join(sourceFolderPath, dirName);
+    // Match <name>{,/index}.{<ext>,<runtime>.<ext>}
+    const globalPatterns = [
+        `${baseName}.{${[
+            ...availableExtensions
+        ].join(',')}}`,
+        `${baseName}.{${[
+            ...runtimeExportConventions
+        ].join(',')}}.{${[
+            ...availableExtensions
+        ].join(',')}}`,
+        `${baseName}/index.{${[
+            ...availableExtensions
+        ].join(',')}}`,
+        `${baseName}/index.{${[
+            ...runtimeExportConventions
+        ].join(',')}}.{${[
+            ...availableExtensions
+        ].join(',')}}`
+    ];
+    const files = await glob.glob(globalPatterns, {
+        cwd: dirPath,
+        nodir: true,
+        ignore: '**/_*'
+    });
+    for (const file of files){
+        const ext = path.extname(file).slice(1);
+        if (!availableExtensions.has(ext) || isTestFile(file)) continue;
+        const sourceFileAbsolutePath = path.join(dirPath, file);
+        const exportPath = relativify(fs.existsSync(absoluteDirPath) && (await fsp__default.default.stat(absoluteDirPath)).isDirectory() ? subpath : originalSubpath);
         if (isBinaryPath) {
-            const binDirentList = await fsp__default.default.readdir(absoluteDirPath, {
-                withFileTypes: true
-            });
-            for (const binDirent of binDirentList){
-                if (binDirent.isFile()) {
-                    const binFileAbsolutePath = path__default.default.join(absoluteDirPath, binDirent.name);
-                    if (fs__default.default.existsSync(binFileAbsolutePath)) {
-                        bins.set(normalizeExportPath(originalSubpath), binFileAbsolutePath);
-                    }
-                }
-            }
+            bins.set(normalizeExportPath(originalSubpath), sourceFileAbsolutePath);
         } else {
-            // Search folder/index.<ext> convention entries
-            for (const extension of availableExtensions){
-                const indexAbsoluteFile = path__default.default.join(absoluteDirPath, `index.${extension}`);
-                // Search folder/index.<special type>.<ext> convention entries
-                for (const specialExportType of runtimeExportConventions){
-                    const indexSpecialAbsoluteFile = path__default.default.join(absoluteDirPath, `index.${specialExportType}.${extension}`);
-                    if (fs__default.default.existsSync(indexSpecialAbsoluteFile)) {
-                        // Add special export path
-                        // { ./<export path>.<special cond>: { <special cond>: 'index.<special cond>.<ext>' } }
-                        const exportPath = relativify(subpath);
-                        const specialExportPath = exportPath + '.' + specialExportType;
-                        const sourceFilesMap = exportsEntries.get(specialExportPath) || {};
-                        sourceFilesMap[specialExportType] = indexSpecialAbsoluteFile;
-                        exportsEntries.set(specialExportPath, sourceFilesMap);
-                    }
-                }
-                if (fs__default.default.existsSync(indexAbsoluteFile) && !isTestFile(indexAbsoluteFile)) {
-                    const exportPath = relativify(subpath);
-                    const sourceFilesMap = exportsEntries.get(exportPath) || {};
-                    const exportType = getExportTypeFromExportPath(exportPath);
-                    sourceFilesMap[exportType] = indexAbsoluteFile;
-                    exportsEntries.set(exportPath, sourceFilesMap);
-                }
-            }
-        }
-    } else {
-        // subpath could be a file
-        const dirName = path.dirname(subpath);
-        const baseName = path.basename(subpath);
-        // Read current file's directory
-        const dirPath = path__default.default.join(sourceFolderPath, dirName);
-        if (!fs__default.default.existsSync(dirPath)) {
-            return;
-        }
-        const dirents = await fsp__default.default.readdir(dirPath, {
-            withFileTypes: true
-        });
-        for (const dirent of dirents){
-            // index.development.js -> index.development
-            const direntBaseName = baseNameWithoutExtension(dirent.name);
-            const ext = path.extname(dirent.name).slice(1);
-            if (!dirent.isFile() || direntBaseName !== baseName || !availableExtensions.has(ext)) {
-                continue;
-            }
-            if (isTestFile(dirent.name)) {
-                continue;
-            }
-            const sourceFileAbsolutePath = path__default.default.join(dirPath, dirent.name);
-            if (isBinaryPath) {
-                bins.set(originalSubpath, sourceFileAbsolutePath);
-            } else {
-                let sourceFilesMap = exportsEntries.get(originalSubpath) || {};
-                const exportType = getExportTypeFromExportPath(originalSubpath);
-                sourceFilesMap[exportType] = sourceFileAbsolutePath;
-                if (specialExportConventions.has(exportType)) {
-                    // e.g. ./foo/index.react-server -> ./foo/index
-                    const fallbackExportPath = sourceFilenameToExportFullPath(originalSubpath);
-                    const fallbackSourceFilesMap = exportsEntries.get(fallbackExportPath) || {};
-                    sourceFilesMap = {
-                        ...fallbackSourceFilesMap,
-                        ...sourceFilesMap
-                    };
-                }
-                exportsEntries.set(originalSubpath, sourceFilesMap);
+            const parts = path.basename(file).split('.');
+            const exportType = parts.length > 2 ? parts[1] : getExportTypeFromExportPath(exportPath);
+            const specialExportPath = exportType !== 'index' && parts.length > 2 ? exportPath + '.' + exportType : exportPath // Adjust for direct file matches
+            ;
+            const sourceFilesMap = exportsEntries.get(specialExportPath) || {};
+            sourceFilesMap[exportType] = sourceFileAbsolutePath;
+            if (specialExportConventions.has(exportType)) {
+                const fallbackExportPath = sourceFilenameToExportFullPath(originalSubpath);
+                const fallbackSourceFilesMap = exportsEntries.get(fallbackExportPath) || {};
+                Object.assign(sourceFilesMap, fallbackSourceFilesMap);
             }
+            exportsEntries.set(specialExportPath, sourceFilesMap);
         }
     }
 }
@@ -769,7 +807,7 @@ async function collectSourceEntriesByExportPath(sourceFolderPath, originalSubpat
  *      "react-server" => "source"
  *   }
  *  }
- */ async function collectSourceEntriesFromExportPaths(sourceFolderPath, parsedExportsInfo) {
+ */ async function collectSourceEntriesFromExportPaths(sourceFolderPath, parsedExportsInfo, pkg) {
     const bins = new Map();
     const exportsEntries = new Map();
     for (const [exportPath, exportInfo] of parsedExportsInfo.entries()){
@@ -785,6 +823,64 @@ async function collectSourceEntriesByExportPath(sourceFolderPath, originalSubpat
             await collectSourceEntriesByExportPath(sourceFolderPath, exportPath + '.' + specialCondition, bins, exportsEntries);
         }
     }
+    // Search private shared module files which are not in the parsedExportsInfo, but start with _.
+    // e.g. _utils.ts, _utils/index.ts
+    // e.g. _utils.development.ts, _utils/index.development.js
+    const privatePattern = [
+        `**/_*{,/index}.{${[
+            ...availableExtensions
+        ].join(',')}}`,
+        `**/_*{,/index}.{${[
+            ...runtimeExportConventions
+        ].join(',')}}.{${[
+            ...availableExtensions
+        ].join(',')}}`
+    ];
+    const privateFiles = await glob.glob(privatePattern, {
+        cwd: sourceFolderPath,
+        nodir: true
+    });
+    for (const file of privateFiles){
+        const sourceFileAbsolutePath = path.join(sourceFolderPath, file);
+        const exportPath = sourceFilenameToExportFullPath(file);
+        const isEsmPkg = isESModulePackage(pkg.type);
+        // const specialItems: [string, string][] = []
+        const specialExportType = getSpecialExportTypeFromSourcePath(file);
+        const normalizedExportPath = stripSpecialCondition(exportPath);
+        const isSpecialExport = specialExportType !== 'default';
+        // export type: default => ''
+        // export type: development => '.development'
+        const condPart = isSpecialExport ? specialExportType + '.' : '';
+        // Map private shared files to the dist directory
+        // e.g. ./_utils.ts -> ./dist/_utils.js
+        const privateExportInfo = [
+            [
+                relativify(path.join('./dist', exportPath + (isEsmPkg ? '.js' : '.mjs'))),
+                condPart + 'import'
+            ],
+            [
+                relativify(path.join('./dist', exportPath + (isEsmPkg ? '.cjs' : '.js'))),
+                condPart + 'require'
+            ]
+        ];
+        const exportsInfo = parsedExportsInfo.get(normalizedExportPath);
+        if (!exportsInfo) {
+            // Add private shared files to parsedExportsInfo
+            parsedExportsInfo.set(normalizedExportPath, privateExportInfo);
+        } else {
+            // Merge private shared files to the existing exportsInfo
+            exportsInfo.push(...privateExportInfo);
+        }
+        // Insert private shared modules into the entries
+        const entry = exportsEntries.get(exportPath);
+        if (!entry) {
+            exportsEntries.set(exportPath, {
+                [specialExportType]: sourceFileAbsolutePath
+            });
+        } else {
+            entry[specialExportType] = sourceFileAbsolutePath;
+        }
+    }
     return {
         bins,
         exportsEntries
@@ -821,9 +917,9 @@ function createOutputState({ entries }) {
             return {
                 name: 'collect-sizes',
                 writeBundle (options, bundle) {
-                    const dir = options.dir || path.posix.dirname(options.file);
+                    const dir = options.dir || path__default.default.dirname(options.file);
                     Object.entries(bundle).forEach(([fileName, chunk])=>{
-                        const filePath = path.posix.join(dir, fileName);
+                        const filePath = path__default.default.join(dir, fileName);
                         if (chunk.type !== 'chunk') {
                             return;
                         }
@@ -834,7 +930,7 @@ function createOutputState({ entries }) {
                         const sourceFileName = chunk.facadeModuleId || '';
                         const exportPath = removeScope(reversedMapping.get(sourceFileName) || '.');
                         addSize({
-                            fileName: path__default.default.isAbsolute(cwd) ? path.posix.relative(cwd, filePath) : filePath,
+                            fileName: path__default.default.relative(cwd, filePath).replace(path__default.default.sep, '/'),
                             size,
                             sourceFileName,
                             exportPath
@@ -960,7 +1056,7 @@ async function writeDefaultTsconfig(tsConfigPath) {
 const FILENAME_REGEX = /__filename/;
 const DIRNAME_REGEX = /__dirname/;
 // not char, or space before require(.resolve)?(
-const GLOBAL_REQUIRE_REGEX = /[\W\s]require(\.resolve)?\(/;
+const GLOBAL_REQUIRE_REGEX = /(?:^|[^.\w'"`])\brequire(\.resolve)?\(\s*[\r\n]*(['"`])/;
 const PolyfillComment = '/** rollup-private-do-not-use-esm-shim-polyfill */';
 const createESMShim = ({ filename, dirname, globalRequire })=>{
     const useNodeUrl = filename || dirname;
@@ -1153,7 +1249,17 @@ function findJsBundlePathCallback({ format, bundlePath, conditionNames }, specia
     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;
+    const match = isMatchedConditionWithFormat && !isTypesCondName && hasBundle && isMatchedFormat;
+    if (!match) {
+        const fallback = runtimeExportConventionsFallback.get(specialCondition);
+        if (!fallback) {
+            return false;
+        } else {
+            return fallback.some((name)=>conditionNames.has(name));
+        }
+    } else {
+        return match;
+    }
 }
 function findTypesFileCallback({ format, bundlePath, conditionNames }) {
     const hasCondition = bundlePath != null;
@@ -1468,19 +1574,6 @@ function getModuleLayer(moduleMeta) {
     const moduleLayer = directives[0];
     return moduleLayer;
 }
-function getCustomModuleLayer(moduleId) {
-    const segments = path__default.default.basename(moduleId).split('.');
-    if (segments.length >= 2) {
-        const [layerSegment, ext] = segments.slice(-2);
-        const baseName = segments[0];
-        const match = layerSegment.match(/^(\w+)-runtime$/);
-        const layer = match && match[1];
-        if (availableExtensions.has(ext) && layer && layer.length > 0) {
-            return baseName + '-' + layer;
-        }
-    }
-    return undefined;
-}
 // dependencyGraphMap: Map<subModuleId, Set<entryParentId>>
 function createSplitChunks(dependencyGraphMap, entryFiles) {
     // If there's existing chunk being splitted, and contains a layer { <id>: <chunkGroup> }
@@ -1493,15 +1586,6 @@ function createSplitChunks(dependencyGraphMap, entryFiles) {
         const { isEntry } = moduleInfo;
         const moduleMeta = moduleInfo.meta;
         const moduleLayer = getModuleLayer(moduleMeta);
-        if (!isEntry) {
-            const cachedCustomModuleLayer = splitChunksGroupMap.get(id);
-            if (cachedCustomModuleLayer) return cachedCustomModuleLayer;
-            const customModuleLayer = getCustomModuleLayer(id);
-            if (customModuleLayer) {
-                splitChunksGroupMap.set(id, customModuleLayer);
-                return customModuleLayer;
-            }
-        }
         // Collect the sub modules of the entry, if they're having layer, and the same layer with the entry, push them to the dependencyGraphMap.
         if (isEntry) {
             const subModuleIds = ctx.getModuleIds();
@@ -1821,7 +1905,7 @@ async function bundle(cliEntryPath, { cwd: _cwd, ...options } = {}) {
             }
         }
     }
-    const entries = await collectEntriesFromParsedExports(cwd, parsedExportsInfo, inputFile);
+    const entries = await collectEntriesFromParsedExports(cwd, parsedExportsInfo, pkg, inputFile);
     const hasTypeScriptFiles = Object.values(entries).some((entry)=>isTypescriptFile(entry.source));
     if (hasTypeScriptFiles && !hasTsConfig) {
         const tsConfigPath = path.resolve(cwd, 'tsconfig.json');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bunchee",
-  "version": "5.6.0",
+  "version": "6.0.0-beta.0",
   "description": "zero config bundler for js/ts/jsx libraries",
   "bin": "./dist/bin/cli.js",
   "main": "./dist/index.js",
@@ -36,19 +36,20 @@
   },
   "license": "MIT",
   "dependencies": {
-    "@rollup/plugin-commonjs": "^28.0.0",
+    "@rollup/plugin-commonjs": "^28.0.1",
     "@rollup/plugin-json": "^6.1.0",
-    "@rollup/plugin-node-resolve": "^15.2.3",
+    "@rollup/plugin-node-resolve": "^15.3.0",
     "@rollup/plugin-replace": "^6.0.1",
     "@rollup/plugin-wasm": "^6.2.2",
     "@rollup/pluginutils": "^5.1.0",
-    "@swc/core": "^1.7.14",
+    "@swc/core": "^1.9.3",
     "@swc/helpers": "^0.5.11",
     "clean-css": "^5.3.3",
+    "glob": "^11.0.0",
     "magic-string": "^0.30.11",
     "ora": "^8.0.1",
     "pretty-bytes": "^5.6.0",
-    "rollup": "^4.24.0",
+    "rollup": "^4.27.4",
     "rollup-plugin-dts": "^6.1.1",
     "rollup-plugin-swc3": "^0.11.1",
     "rollup-preserve-directives": "^1.1.2",
@@ -73,7 +74,7 @@
     "@swc/types": "^0.1.9",
     "@types/clean-css": "^4.2.11",
     "@types/jest": "29.0.0",
-    "@types/node": "^20.4.1",
+    "@types/node": "^22.9.3",
     "@types/yargs": "^17.0.33",
     "bunchee": "link:./",
     "cross-env": "^7.0.3",
@@ -82,7 +83,7 @@
     "lint-staged": "^15.2.2",
     "picocolors": "^1.0.0",
     "prettier": "^3.0.0",
-    "react": "^18.2.0",
+    "react": "^18.3.1",
     "typescript": "^5.6.2"
   },
   "lint-staged": {