lib,test: improves ERR_REQUIRE_ESM message

PR-URL: #30694Fixes: #30599
Reviewed-By: Guy Bedford <guybedford@gmail.com>

Author: juanarbol

lib/internal/errors.js

@@ -1112,7 +1112,26 @@ E('ERR_OUT_OF_RANGE',
 msg+=` It must be ${range}. Received ${received}`;
 returnmsg;
 },RangeError);
-E('ERR_REQUIRE_ESM','Must use import to load ES Module: %s',Error);
+E('ERR_REQUIRE_ESM',
+(filename,parentPath=null,packageJsonPath=null)=>{
+letmsg=`Must use import to load ES Module: ${filename}`;
+if(parentPath&&packageJsonPath){
+constpath=require('path');
+constbasename=path.basename(filename)===path.basename(parentPath) ?
+filename : path.basename(filename);
+msg+=
+'\nrequire() of ES modules is not supported.\nrequire() of '+
+`${filename}${parentPath ? `from ${parentPath} ` : ''}`+
+'is an ES module file as it is a .js file whose nearest parent '+
+'package.json contains "type": "module" which defines all .js '+
+'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 '+
+`${packageJsonPath}.\n`;
+returnmsg;
+}
+returnmsg;
+},Error);
 E('ERR_SCRIPT_EXECUTION_INTERRUPTED',
 'Script execution was interrupted by `SIGINT`',Error);
 E('ERR_SERVER_ALREADY_LISTEN',

lib/internal/modules/cjs/loader.js

@@ -1135,35 +1135,14 @@ Module.prototype._compile = function(content, filename) {
 };
 
 // Native extension for .js
-letwarnRequireESM=true;
 Module._extensions['.js']=function(module,filename){
 if(filename.endsWith('.js')){
 constpkg=readPackageScope(filename);
+// Function require shouldn't be used in ES modules.
 if(pkg&&pkg.data&&pkg.data.type==='module'){
-if(warnRequireESM){
-constparentPath=module.parent&&module.parent.filename;
-constbasename=parentPath&&
-path.basename(filename)===path.basename(parentPath) ?
-filename : path.basename(filename);
-process.emitWarning(
-'require() of ES modules is not supported.\nrequire() of '+
-`${filename}${parentPath ? `from ${module.parent.filename} ` : ''}`+
-'is an ES module file as it is a .js file whose nearest parent '+
-'package.json contains "type": "module" which defines all .js '+
-'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 '+
-`${path.resolve(pkg.path,'package.json')}.`,
-undefined,
-undefined,
-undefined,
-true
-);
-warnRequireESM=false;
-}
-if(experimentalModules){
-thrownewERR_REQUIRE_ESM(filename);
-}
+constparentPath=module.parent&&module.parent.filename;
+constpackageJsonPath=path.resolve(pkg.path,'package.json');
+thrownewERR_REQUIRE_ESM(filename,parentPath,packageJsonPath);
 }
 }
 constcontent=fs.readFileSync(filename,'utf8');

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

@@ -23,16 +23,22 @@ child.stderr.on('data', (data) => {
 stderr+=data;
 });
 child.on('close',common.mustCall((code,signal)=>{
-assert.strictEqual(code,0);
+assert.strictEqual(code,1);
 assert.strictEqual(signal,null);
 
-assert.strictEqual(stderr,`(node:${child.pid}) Warning: `+
-'require() of ES modules is not supported.\nrequire() of '+
+assert.ok(stderr.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} `+
 'is an ES module file as it is a .js file whose nearest parent '+
 'package.json contains "type": "module" which defines all .js '+
 '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`);
+`${pjson}.\n`)!==-1);
+assert.ok(stderr.indexOf(
+'Error [ERR_REQUIRE_ESM]: Must use import to load ES Module')!==-1);
+
+assert.strictEqual(
+stderr.match(/MustuseimporttoloadESModule/g).length,1);
 }));

test/es-module/test-esm-type-flag-errors.js

@@ -28,7 +28,10 @@ try {
 require('../fixtures/es-modules/package-type-module/index.js');
 assert.fail('Expected CJS to fail loading from type: module package.');
 }catch(e){
-assert(e.toString().match(/Error\[ERR_REQUIRE_ESM\]:MustuseimporttoloadESModule:/));
+assert.strictEqual(e.name,'Error');
+assert.strictEqual(e.code,'ERR_REQUIRE_ESM');
+assert(e.toString().match(/MustuseimporttoloadESModule/g));
+assert(e.message.match(/MustuseimporttoloadESModule/g));
 }
 
 functionexpect(opt='',inputFile,want,wantsError=false){