From 6fc1b9bca1e5f2445116c6e7fcbfb7f3b5455870 Mon Sep 17 00:00:00 2001 From: Guy Bedford Date: Thu, 5 Dec 2019 00:11:04 -0500 Subject: [PATCH 1/8] module: fixup lint regression --- lib/internal/modules/cjs/loader.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/internal/modules/cjs/loader.js b/lib/internal/modules/cjs/loader.js index 687d39563d184b..d5c6352c495636 100644 --- a/lib/internal/modules/cjs/loader.js +++ b/lib/internal/modules/cjs/loader.js @@ -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'; From 17f02359508ff95afdf57cd31f2d5043342a148f Mon Sep 17 00:00:00 2001 From: Guy Bedford Date: Thu, 5 Dec 2019 01:19:26 -0500 Subject: [PATCH 2/8] fixup windows bug attempt --- test/es-module/test-cjs-esm-warn.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/es-module/test-cjs-esm-warn.js b/test/es-module/test-cjs-esm-warn.js index b800a47d0515d5..b0c5a0429aa709 100644 --- a/test/es-module/test-cjs-esm-warn.js +++ b/test/es-module/test-cjs-esm-warn.js @@ -26,9 +26,9 @@ child.on('close', common.mustCall((code, signal) => { assert.strictEqual(code, 1); assert.strictEqual(signal, null); - assert.ok(stderr.indexOf( + assert.ok(stderr.replace(/\r/, '').indexOf( `Error [ERR_REQUIRE_ESM]: Must use import to load ES Module: ${required}` + - '\nrequire() of ES modules is not supported.\nrequire() of ' + + `\nrequire() of ES modules is not supported.\nrequire() of ` + `${required} from ${requiring} ` + 'is an ES module file as it is a .js file whose nearest parent ' + 'package.json contains "type": "module" which defines all .js ' + From 7e916c69d415daaf1608c14c7a0c05c5257070e4 Mon Sep 17 00:00:00 2001 From: Guy Bedford Date: Thu, 5 Dec 2019 01:23:05 -0500 Subject: [PATCH 3/8] fixup quotes --- test/es-module/test-cjs-esm-warn.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/es-module/test-cjs-esm-warn.js b/test/es-module/test-cjs-esm-warn.js index b0c5a0429aa709..1fa5a7ef9d5148 100644 --- a/test/es-module/test-cjs-esm-warn.js +++ b/test/es-module/test-cjs-esm-warn.js @@ -28,7 +28,7 @@ child.on('close', common.mustCall((code, signal) => { assert.ok(stderr.replace(/\r/, '').indexOf( `Error [ERR_REQUIRE_ESM]: Must use import to load ES Module: ${required}` + - `\nrequire() of ES modules is not supported.\nrequire() of ` + + '\nrequire() of ES modules is not supported.\nrequire() of ' + `${required} from ${requiring} ` + 'is an ES module file as it is a .js file whose nearest parent ' + 'package.json contains "type": "module" which defines all .js ' + From 1bb808f5b070d052de49505ac8ba0eb56840fc49 Mon Sep 17 00:00:00 2001 From: Guy Bedford Date: Thu, 5 Dec 2019 01:30:57 -0500 Subject: [PATCH 4/8] fixup regex global --- test/es-module/test-cjs-esm-warn.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/es-module/test-cjs-esm-warn.js b/test/es-module/test-cjs-esm-warn.js index 1fa5a7ef9d5148..993b3170af2ca4 100644 --- a/test/es-module/test-cjs-esm-warn.js +++ b/test/es-module/test-cjs-esm-warn.js @@ -26,7 +26,7 @@ child.on('close', common.mustCall((code, signal) => { assert.strictEqual(code, 1); assert.strictEqual(signal, null); - assert.ok(stderr.replace(/\r/, '').indexOf( + assert.ok(stderr.replace(/\r/g, '').indexOf( `Error [ERR_REQUIRE_ESM]: Must use import to load ES Module: ${required}` + '\nrequire() of ES modules is not supported.\nrequire() of ' + `${required} from ${requiring} ` + From b005b923f15518846c681c8b6657a8158f9268e2 Mon Sep 17 00:00:00 2001 From: Guy Bedford Date: Thu, 5 Dec 2019 01:34:12 -0500 Subject: [PATCH 5/8] further test refinements --- test/es-module/test-cjs-esm-warn.js | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/test/es-module/test-cjs-esm-warn.js b/test/es-module/test-cjs-esm-warn.js index 993b3170af2ca4..584d17ec979a6e 100644 --- a/test/es-module/test-cjs-esm-warn.js +++ b/test/es-module/test-cjs-esm-warn.js @@ -26,7 +26,7 @@ child.on('close', common.mustCall((code, signal) => { assert.strictEqual(code, 1); assert.strictEqual(signal, null); - assert.ok(stderr.replace(/\r/g, '').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,9 @@ 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); + `${pjson}.\n`)); + assert.ok(stderr.includes( + 'Error [ERR_REQUIRE_ESM]: Must use import to load ES Module')); - assert.strictEqual( - stderr.match(/Must use import to load ES Module/g).length, 1); + assert.ok(stderr.includes('Must use import to load ES Module')); })); From 45a835ce212305ca8fbda5a79c1948a8d8d0af04 Mon Sep 17 00:00:00 2001 From: Guy Bedford Date: Thu, 5 Dec 2019 01:35:33 -0500 Subject: [PATCH 6/8] remove unnecessary line --- test/es-module/test-cjs-esm-warn.js | 2 -- 1 file changed, 2 deletions(-) diff --git a/test/es-module/test-cjs-esm-warn.js b/test/es-module/test-cjs-esm-warn.js index 584d17ec979a6e..ddeda72fc84b41 100644 --- a/test/es-module/test-cjs-esm-warn.js +++ b/test/es-module/test-cjs-esm-warn.js @@ -38,6 +38,4 @@ child.on('close', common.mustCall((code, signal) => { `${pjson}.\n`)); assert.ok(stderr.includes( 'Error [ERR_REQUIRE_ESM]: Must use import to load ES Module')); - - assert.ok(stderr.includes('Must use import to load ES Module')); })); From 3698b288900721c0a4d99aaff9a087ba33350cd3 Mon Sep 17 00:00:00 2001 From: Guy Bedford Date: Thu, 5 Dec 2019 01:59:48 -0500 Subject: [PATCH 7/8] try increase timeout --- test/es-module/test-esm-specifiers-both-flags.mjs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/es-module/test-esm-specifiers-both-flags.mjs b/test/es-module/test-esm-specifiers-both-flags.mjs index fc5c7fcd0e98a9..30028d5fa3d504 100644 --- a/test/es-module/test-esm-specifiers-both-flags.mjs +++ b/test/es-module/test-esm-specifiers-both-flags.mjs @@ -10,7 +10,7 @@ const flags = '--es-module-specifier-resolution=node ' + '--experimental-specifier-resolution=node'; exec(`${process.execPath} ${flags}`, { - timeout: 300 + timeout: 500 }, mustCall((error) => { assert(error.message.includes(expectedError)); })); From 3903f5a9dacb8bf47914b842fdc662380a91d932 Mon Sep 17 00:00:00 2001 From: Guy Bedford Date: Thu, 5 Dec 2019 02:04:59 -0500 Subject: [PATCH 8/8] remove timeout --- test/es-module/test-esm-specifiers-both-flags.mjs | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/test/es-module/test-esm-specifiers-both-flags.mjs b/test/es-module/test-esm-specifiers-both-flags.mjs index 30028d5fa3d504..a434684589dc07 100644 --- a/test/es-module/test-esm-specifiers-both-flags.mjs +++ b/test/es-module/test-esm-specifiers-both-flags.mjs @@ -9,8 +9,6 @@ const expectedError = const flags = '--es-module-specifier-resolution=node ' + '--experimental-specifier-resolution=node'; -exec(`${process.execPath} ${flags}`, { - timeout: 500 -}, mustCall((error) => { +exec(`${process.execPath} ${flags}`, mustCall((error) => { assert(error.message.includes(expectedError)); }));