diff --git a/build-system/tasks/extension-helpers.js b/build-system/tasks/extension-helpers.js index 4edc53056d068..ba9c905c13a69 100644 --- a/build-system/tasks/extension-helpers.js +++ b/build-system/tasks/extension-helpers.js @@ -25,6 +25,7 @@ const { doBuildJs, endBuildStep, maybeToEsmName, + maybeToNpmEsmName, mkdirSync, watchDebounceDelay, } = require('./helpers'); @@ -615,8 +616,8 @@ function buildBinaries(extDir, binaries, options) { entryPoint, `${extDir}/dist`, Object.assign(options, { - toName: maybeToEsmName(`${name}.max.js`), - minifiedName: maybeToEsmName(`${name}.js`), + toName: maybeToNpmEsmName(`${name}.max.js`), + minifiedName: maybeToNpmEsmName(`${name}.js`), latestName: '', outputFormat: esm ? 'esm' : 'cjs', wrapper: '', diff --git a/build-system/tasks/helpers.js b/build-system/tasks/helpers.js index 3bcebe486d963..7e9626d746139 100644 --- a/build-system/tasks/helpers.js +++ b/build-system/tasks/helpers.js @@ -291,6 +291,14 @@ function maybeToEsmName(name) { return argv.esm ? toEsmName(name) : name; } +/** + * @param {string} name + * @return {string} + */ +function maybeToNpmEsmName(name) { + return argv.esm ? name.replace(/\.js$/, '.module.js') : name; +} + /** * Minifies a given JavaScript file entry point. * @param {string} srcDir @@ -503,9 +511,8 @@ async function compileUnminifiedJs(srcDir, srcFilename, destDir, options) { async function compileJsWithEsbuild(srcDir, srcFilename, destDir, options) { const startTime = Date.now(); const entryPoint = path.join(srcDir, srcFilename); - const destFilename = maybeToEsmName( - options.minify ? options.minifiedName : options.toName - ); + const fileName = options.minify ? options.minifiedName : options.toName; + const destFilename = options.npm ? fileName : maybeToEsmName(fileName); const destFile = path.join(destDir, destFilename); if (watchedTargets.has(entryPoint)) { @@ -866,6 +873,7 @@ module.exports = { compileUnminifiedJs, maybePrintCoverageMessage, maybeToEsmName, + maybeToNpmEsmName, mkdirSync, printConfigHelp, printNobuildHelp,