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 24b8585

Browse filesBrowse files
inoway46aduh95
authored andcommitted
module: fix extensionless entry with explicit type=commonjs
PR-URL: #61600 Fixes: #61104 Reviewed-By: Joyee Cheung <joyeec9h3@gmail.com> Reviewed-By: Marco Ippolito <marcoippolito54@gmail.com> Reviewed-By: Stephen Belanger <admin@stephenbelanger.com>
1 parent 435f3dd commit 24b8585
Copy full SHA for 24b8585

6 files changed

+42Lines changed: 42 additions & 0 deletions

File tree

Expand file treeCollapse file tree
Open diff view settings
Filter options
Expand file treeCollapse file tree
Open diff view settings
Collapse file

‎lib/internal/modules/cjs/loader.js‎

Copy file name to clipboardExpand all lines: lib/internal/modules/cjs/loader.js
+9Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1931,6 +1931,15 @@ Module._extensions['.js'] = function(module, filename) {
19311931
} else {
19321932
format = 'typescript';
19331933
}
1934+
} else if (path.extname(filename) === '') {
1935+
// Extensionless files skip the .js suffix check above. When type is explicit,
1936+
// follow it so ESM syntax surfaces as SyntaxError for commonjs instead of
1937+
// silently delegating to ESM.
1938+
pkg = packageJsonReader.getNearestParentPackageJSON(filename);
1939+
const typeFromPjson = pkg?.data?.type;
1940+
if (typeFromPjson === 'commonjs' || typeFromPjson === 'module') {
1941+
format = typeFromPjson;
1942+
}
19341943
}
19351944
const { source, format: loadedFormat } = loadSource(module, filename, format);
19361945
// Function require shouldn't be used in ES modules when require(esm) is disabled.
Collapse file
+19Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
'use strict';
2+
3+
require('../common');
4+
const { spawnSyncAndAssert } = require('../common/child_process');
5+
const fixtures = require('../common/fixtures');
6+
7+
spawnSyncAndAssert(process.execPath, [
8+
fixtures.path('es-modules', 'extensionless-esm-commonjs', 'script'),
9+
], {
10+
status: 1,
11+
stderr: /SyntaxError: Cannot use import statement outside a module/,
12+
});
13+
14+
spawnSyncAndAssert(process.execPath, [
15+
fixtures.path('es-modules', 'extensionless-esm-module', 'script'),
16+
], {
17+
stdout: /script STARTED[\s\S]*v\d+\./,
18+
trim: true,
19+
});
Collapse file
+3Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
"type": "commonjs"
3+
}
Collapse file
+4Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
#!/usr/bin/env node
2+
console.log('script STARTED')
3+
import { version } from 'node:process'
4+
console.log(version)
Collapse file
+3Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
"type": "module"
3+
}
Collapse file
+4Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
#!/usr/bin/env node
2+
console.log('script STARTED')
3+
import { version } from 'node:process'
4+
console.log(version)

0 commit comments

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