Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Commit 5c20dcc

Browse filesBrowse files
guybedfordtargos
authored andcommitted
esm: fix module.exports export on CJS modules
PR-URL: #57366 Reviewed-By: Joyee Cheung <joyeec9h3@gmail.com> Reviewed-By: Michaël Zasso <targos@protonmail.com> Reviewed-By: James M Snell <jasnell@gmail.com>
1 parent 36542b5 commit 5c20dcc
Copy full SHA for 5c20dcc

File tree

Expand file treeCollapse file tree

2 files changed

+16
-11
lines changed
Open diff view settings
Filter options
Expand file treeCollapse file tree

2 files changed

+16
-11
lines changed
Open diff view settings
Collapse file

‎lib/internal/modules/esm/translators.js‎

Copy file name to clipboardExpand all lines: lib/internal/modules/esm/translators.js
+6-2Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -188,10 +188,13 @@ function createCJSModuleWrap(url, source, isMain, format, loadCJS = loadCJSModul
188188
const { exportNames, module } = cjsPreparseModuleExports(filename, source, format);
189189
cjsCache.set(url, module);
190190

191-
const wrapperNames = [...exportNames, 'module.exports'];
191+
const wrapperNames = [...exportNames];
192192
if (!exportNames.has('default')) {
193193
ArrayPrototypePush(wrapperNames, 'default');
194194
}
195+
if (!exportNames.has('module.exports')) {
196+
ArrayPrototypePush(wrapperNames, 'module.exports');
197+
}
195198

196199
if (isMain) {
197200
setOwnProperty(process, 'mainModule', module);
@@ -212,7 +215,8 @@ function createCJSModuleWrap(url, source, isMain, format, loadCJS = loadCJSModul
212215
({ exports } = module);
213216
}
214217
for (const exportName of exportNames) {
215-
if (!ObjectPrototypeHasOwnProperty(exports, exportName) || exportName === 'default') {
218+
if (exportName === 'default' || exportName === 'module.exports' ||
219+
!ObjectPrototypeHasOwnProperty(exports, exportName)) {
216220
continue;
217221
}
218222
// We might trigger a getter -> dont fail.
Collapse file
+10-9Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
1-
if (global.maybe)
2-
module.exports = require('../is-object');
3-
exports['invalid identifier'] = 'yes';
4-
module.exports['?invalid'] = 'yes';
5-
module.exports['π'] = 'yes';
6-
exports['\u{D83C}'] = 'no';
7-
exports['\u{D83C}\u{DF10}'] = 'yes';
8-
exports.package = 10; // reserved word
9-
Object.defineProperty(exports, 'z', { value: 'yes' });
1+
if (global.maybe)
2+
module.exports = require('../is-object');
3+
exports['invalid identifier'] = 'yes';
4+
module.exports['?invalid'] = 'yes';
5+
module.exports['π'] = 'yes';
6+
exports['\u{D83C}'] = 'no';
7+
exports['\u{D83C}\u{DF10}'] = 'yes';
8+
exports.package = 10; // reserved word
9+
Object.defineProperty(exports, 'z', { value: 'yes' });
10+
exports['module.exports'] = 5;

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.