From dd27d8f7d3e418f35f914ddea93962a9bcd224d7 Mon Sep 17 00:00:00 2001 From: Jason Miller Date: Thu, 16 Apr 2020 14:30:43 -0400 Subject: [PATCH 1/5] Strip .ts extensions when generating bundle filenames --- src/index.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/index.js b/src/index.js index 9accf48..0d73c91 100644 --- a/src/index.js +++ b/src/index.js @@ -429,12 +429,12 @@ 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\//) From 0fa522d3f315b2565ea132656e2d56c65f8de19b Mon Sep 17 00:00:00 2001 From: Jason Miller Date: Thu, 16 Apr 2020 14:34:26 -0400 Subject: [PATCH 2/5] prettier --- src/index.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/index.js b/src/index.js index 0d73c91..db41663 100644 --- a/src/index.js +++ b/src/index.js @@ -434,7 +434,10 @@ function createConfig(options, entry, format, writeMeta) { : entry; mainNoExtension = resolve(dirname(mainNoExtension), basename(name)); } - mainNoExtension = mainNoExtension.replace(/(\.(umd|cjs|es|m))?\.(mjs|[tj]sx?)$/, ''); + mainNoExtension = mainNoExtension.replace( + /(\.(umd|cjs|es|m))?\.(mjs|[tj]sx?)$/, + '' + ); let moduleMain = replaceName( pkg.module && !pkg.module.match(/src\//) From 190c9d79e2742f71245762251a73460f4ad9af05 Mon Sep 17 00:00:00 2001 From: Jason Miller Date: Thu, 16 Apr 2020 16:11:17 -0400 Subject: [PATCH 3/5] :| --- src/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/index.js b/src/index.js index db41663..11cc0c9 100644 --- a/src/index.js +++ b/src/index.js @@ -436,7 +436,7 @@ function createConfig(options, entry, format, writeMeta) { } mainNoExtension = mainNoExtension.replace( /(\.(umd|cjs|es|m))?\.(mjs|[tj]sx?)$/, - '' + '', ); let moduleMain = replaceName( From 195451d930e32defeba3492965755afc866b332b Mon Sep 17 00:00:00 2001 From: Jason Miller Date: Sat, 18 Apr 2020 11:25:55 -0400 Subject: [PATCH 4/5] Set preferBuiltins:true for Node This option was enabled by default at some point in the node-resolve plugin, which should already have fixed #303 and #288. It still prints a warning though, which is illogical when we're compiling for a Node target. This silences that warning. --- src/index.js | 1 + 1 file changed, 1 insertion(+) diff --git a/src/index.js b/src/index.js index 9accf48..eb54aff 100644 --- a/src/index.js +++ b/src/index.js @@ -529,6 +529,7 @@ function createConfig(options, entry, format, writeMeta) { browser: options.target !== 'node', // defaults + .jsx extensions: ['.mjs', '.js', '.jsx', '.json', '.node'], + preferBuiltins: options.target === 'node' ? true : undefined }), commonjs({ // use a regex to make sure to include eventual hoisted packages From e13ecddc458e6cf9e15604e4dd92be67ee00d17d Mon Sep 17 00:00:00 2001 From: Jason Miller Date: Sat, 18 Apr 2020 11:27:36 -0400 Subject: [PATCH 5/5] lint --- src/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/index.js b/src/index.js index eb54aff..b3a9774 100644 --- a/src/index.js +++ b/src/index.js @@ -529,7 +529,7 @@ function createConfig(options, entry, format, writeMeta) { browser: options.target !== 'node', // defaults + .jsx extensions: ['.mjs', '.js', '.jsx', '.json', '.node'], - preferBuiltins: options.target === 'node' ? true : undefined + preferBuiltins: options.target === 'node' ? true : undefined, }), commonjs({ // use a regex to make sure to include eventual hoisted packages