fixup! esm: fix misleading error when import empty package.json

Author: himself65

src/node_file.cc

@@ -3493,9 +3493,8 @@ void BindingData::LegacyMainResolve(const FunctionCallbackInfo<Value>& args) {
   }
 
   THROW_ERR_MODULE_NOT_FOUND(isolate,
-                             "No package entry point defined for package"
-                             " %s imported from %s",
-                             *utf8_package_json_url,
+                             "Entry point '%s' resolved from '%s' incorrectly",
+                             package_initial_file,
                              *module_base);
 }
 

test/es-module/test-cjs-legacyMainResolve.js

@@ -129,15 +129,15 @@ describe('legacyMainResolve', () => {
     );
     assert.throws(
       () => legacyMainResolve(packageJsonUrl, { main: null }, packageJsonUrl),
-      { message: /No package entry point defined for package/, code: 'ERR_MODULE_NOT_FOUND' },
+      { message: /Entry point '[\w\S]+' resolved from '[\w\S]+' incorrectly/, code: 'ERR_MODULE_NOT_FOUND' },
     );
   });
 
   it('should not crash when cannot resolve to a file that contains special chars', () => {
     const packageJsonUrl = pathToFileURL('/c/file%20with%20percents/package.json');
     assert.throws(
       () => legacyMainResolve(packageJsonUrl, { main: null }, packageJsonUrl),
-      { message: /No package entry point defined for package/, code: 'ERR_MODULE_NOT_FOUND' },
+      { message: /Entry point '[\w\S]+' resolved from '[\w\S]+' incorrectly/, code: 'ERR_MODULE_NOT_FOUND' },
     );
   });
 
@@ -150,7 +150,7 @@ describe('legacyMainResolve', () => {
     );
     assert.throws(
       () => legacyMainResolve(packageJsonUrl, { main: './index.node' }, packageJsonUrl),
-      { message: /No package entry point defined for package/, code: 'ERR_MODULE_NOT_FOUND' },
+      { message: /Entry point '[\w\S]+' resolved from '[\w\S]+' incorrectly/, code: 'ERR_MODULE_NOT_FOUND' },
     );
   });
 

test/es-module/test-import-empty.js

@@ -15,7 +15,7 @@ describe('Import empty module', { concurrency: true }, () => {
     ], {
       cwd: fixtures.path(),
     });
-    assert.match(stderr, /No package entry point defined for package/);
+    assert.match(stderr, /Entry point '[\w\S]+' resolved from '[\w\S]+' incorrectly/);
     assert.strictEqual(stdout, '');
     assert.strictEqual(code, 1);
     assert.strictEqual(signal, null);