Merge branch 'master' into define-expression-replacement

This commit is contained in:
Jason Miller 2020-04-30 13:18:45 -04:00 committed by GitHub
commit e552ead847
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -434,12 +434,15 @@ function createConfig(options, entry, format, writeMeta) {
let mainNoExtension = options.output;
if (options.multipleEntries) {
let name = entry.match(/([\\/])index(\.(umd|cjs|es|m))?\.m?js$/)
let name = entry.match(/([\\/])index(\.(umd|cjs|es|m))?\.(mjs|[tj]sx?)$/)
? mainNoExtension
: entry;
mainNoExtension = resolve(dirname(mainNoExtension), basename(name));
}
mainNoExtension = mainNoExtension.replace(/(\.(umd|cjs|es|m))?\.m?js$/, '');
mainNoExtension = mainNoExtension.replace(
/(\.(umd|cjs|es|m))?\.(mjs|[tj]sx?)$/,
'',
);
let moduleMain = replaceName(
pkg.module && !pkg.module.match(/src\//)