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 2a2ae8e

Browse filesBrowse files
guybedfordMylesBorins
authored andcommitted
module: fixup lint and test regressions
PR-URL: #30802 Reviewed-By: Rich Trott <rtrott@gmail.com> Reviewed-By: João Reis <reis@janeasystems.com> Reviewed-By: Matteo Collina <matteo.collina@gmail.com>
1 parent 9696e9e commit 2a2ae8e
Copy full SHA for 2a2ae8e

File tree

Expand file treeCollapse file tree

2 files changed

+5
-10
lines changed
Open diff view settings
Filter options
Expand file treeCollapse file tree

2 files changed

+5
-10
lines changed
Open diff view settings
Collapse file

‎test/es-module/test-cjs-esm-warn.js‎

Copy file name to clipboardExpand all lines: test/es-module/test-cjs-esm-warn.js
+4-7Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ child.on('close', common.mustCall((code, signal) => {
2626
assert.strictEqual(code, 1);
2727
assert.strictEqual(signal, null);
2828

29-
assert.ok(stderr.indexOf(
29+
assert.ok(stderr.replace(/\r/g, '').includes(
3030
`Error [ERR_REQUIRE_ESM]: Must use import to load ES Module: ${required}` +
3131
'\nrequire() of ES modules is not supported.\nrequire() of ' +
3232
`${required} from ${requiring} ` +
@@ -35,10 +35,7 @@ child.on('close', common.mustCall((code, signal) => {
3535
'files in that package scope as ES modules.\nInstead rename ' +
3636
`${basename} to end in .cjs, change the requiring code to use ` +
3737
'import(), or remove "type": "module" from ' +
38-
`${pjson}.\n`) !== -1);
39-
assert.ok(stderr.indexOf(
40-
'Error [ERR_REQUIRE_ESM]: Must use import to load ES Module') !== -1);
41-
42-
assert.strictEqual(
43-
stderr.match(/Must use import to load ES Module/g).length, 1);
38+
`${pjson}.\n`));
39+
assert.ok(stderr.includes(
40+
'Error [ERR_REQUIRE_ESM]: Must use import to load ES Module'));
4441
}));
Collapse file

‎test/es-module/test-esm-specifiers-both-flags.mjs‎

Copy file name to clipboardExpand all lines: test/es-module/test-esm-specifiers-both-flags.mjs
+1-3Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,6 @@ const flags = '--experimental-modules ' +
1111
'--es-module-specifier-resolution=node ' +
1212
'--experimental-specifier-resolution=node';
1313

14-
exec(`${process.execPath} ${flags}`, {
15-
timeout: 300
16-
}, mustCall((error) => {
14+
exec(`${process.execPath} ${flags}`, mustCall((error) => {
1715
assert(error.message.includes(expectedError));
1816
}));

0 commit comments

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