Skip to content

module: fixup lint regression #30802

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
guybedford wants to merge 8 commits into from
Closed

module: fixup lint regression #30802

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
6fc1b9b
module: fixup lint regression
guybedford Dec 5, 2019
17f0235
fixup windows bug attempt
guybedford Dec 5, 2019
7e916c6
fixup quotes
guybedford Dec 5, 2019
1bb808f
fixup regex global
guybedford Dec 5, 2019
b005b92
further test refinements
guybedford Dec 5, 2019
45a835c
remove unnecessary line
guybedford Dec 5, 2019
3698b28
try increase timeout
guybedford Dec 5, 2019
3903f5a
remove timeout
guybedford Dec 5, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion lib/internal/modules/cjs/loader.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1169,7 +1169,7 @@ Module.prototype._compile = function(content, filename) {
} catch {
// We only expect this codepath to be reached in the case of a
// preloaded module (it will fail earlier with the main entry)
assert(Array.isArray(getOptionValue('--require')));
assert(ArrayIsArray(getOptionValue('--require')));
}
} else {
resolvedArgv = 'repl';
Expand Down
11 changes: 4 additions & 7 deletions test/es-module/test-cjs-esm-warn.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ child.on('close', common.mustCall((code, signal) => {
assert.strictEqual(code, 1);
assert.strictEqual(signal, null);

assert.ok(stderr.indexOf(
assert.ok(stderr.replace(/\r/g, '').includes(
`Error [ERR_REQUIRE_ESM]: Must use import to load ES Module: ${required}` +
'\nrequire() of ES modules is not supported.\nrequire() of ' +
`${required} from ${requiring} ` +
Expand All @@ -35,10 +35,7 @@ child.on('close', common.mustCall((code, signal) => {
'files in that package scope as ES modules.\nInstead rename ' +
`${basename} to end in .cjs, change the requiring code to use ` +
'import(), or remove "type": "module" from ' +
`${pjson}.\n`) !== -1);
assert.ok(stderr.indexOf(
'Error [ERR_REQUIRE_ESM]: Must use import to load ES Module') !== -1);

assert.strictEqual(
stderr.match(/Must use import to load ES Module/g).length, 1);
`${pjson}.\n`));
assert.ok(stderr.includes(
'Error [ERR_REQUIRE_ESM]: Must use import to load ES Module'));
}));
2 changes: 1 addition & 1 deletion test/es-module/test-esm-specifiers-both-flags.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ const flags = '--es-module-specifier-resolution=node ' +
'--experimental-specifier-resolution=node';

exec(`${process.execPath} ${flags}`, {
timeout: 300
timeout: 500
Comment thread
guybedford marked this conversation as resolved.
Resolved
}, mustCall((error) => {
assert(error.message.includes(expectedError));
}));