nodejs
diff --git a/‎lib/internal/modules/cjs/loader.js‎
Lines changed: 1 addition & 1 deletion b/‎lib/internal/modules/cjs/loader.js‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎test/es-module/test-cjs-esm-warn.js‎
Lines changed: 4 additions & 7 deletions b/‎test/es-module/test-cjs-esm-warn.js‎
Lines changed: 4 additions & 7 deletions
diff --git a/‎test/es-module/test-esm-specifiers-both-flags.mjs‎
Lines changed: 1 addition & 3 deletions b/‎test/es-module/test-esm-specifiers-both-flags.mjs‎
Lines changed: 1 addition & 3 deletions
@@ -1112,7 +1112,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';
 
@@ -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} ` +
@@ -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'));
 }));
@@ -9,8 +9,6 @@ const expectedError =
 const flags = '--es-module-specifier-resolution=node ' +
               '--experimental-specifier-resolution=node';
 
-exec(`${process.execPath} ${flags}`, {
-  timeout: 300
-}, mustCall((error) => {
+exec(`${process.execPath} ${flags}`, mustCall((error) => {
   assert(error.message.includes(expectedError));
 }));
Original file line number	Diff line number	Diff line change
@@ -1112,7 +1112,7 @@ Module.prototype._compile = function(content, filename) {
1112	1112	} catch {
1113	1113	// We only expect this codepath to be reached in the case of a
1114	1114	// preloaded module (it will fail earlier with the main entry)
1115		- assert(Array.isArray(getOptionValue('--require')));
	1115	+ assert(ArrayIsArray(getOptionValue('--require')));
1116	1116	}
1117	1117	} else {
1118	1118	resolvedArgv = 'repl';