import errors have `code` set to `ERR_MODULE_NOT_FOUND` and `require` errors have `code` set to `MODULE_NOT_FOUND` (#4244)

* ResolveMessage

* Fix it

---------

Co-authored-by: Jarred Sumner <709451+Jarred-Sumner@users.noreply.github.com>

2 files changed, 3 insertions, 13 deletions

diff --git a/src/js/builtins/Module.ts b/src/js/builtins/Module.ts
index ca7c0fa91..d6ebc8578 100644
--- a/src/js/builtins/Module.ts
+++ b/src/js/builtins/Module.ts
@@ -82,17 +82,7 @@ export function require(this: CommonJSModuleRecord, id: string) {
 }
 
 export function requireResolve(this: string | { path: string }, id: string) {
-  // This try catch is needed because err.code on ESM resolves is ERR_MODULE_NOT_FOUND
-  // while in require.resolve this error code is only MODULE_NOT_FOUND.
-  // `local-pkg` will check for .code's exact value, and log extra messages if we don't match it.
-  try {
-    return $resolveSync(id, typeof this === "string" ? this : this?.path, false);
-  } catch (error) {
-    var e = new Error(`Cannot find module '${id}'`);
-    e.code = "MODULE_NOT_FOUND";
-    // e.requireStack = []; // TODO: we might have to implement this
-    throw e;
-  }
+  return $resolveSync(id, typeof this === "string" ? this : this?.path, false);
 }
 
 export function requireNativeModule(id: string) {
diff --git a/src/js/out/WebCoreJSBuiltins.cpp b/src/js/out/WebCoreJSBuiltins.cpp
index 285c4b899..70822eaca 100644
--- a/src/js/out/WebCoreJSBuiltins.cpp
+++ b/src/js/out/WebCoreJSBuiltins.cpp
@@ -722,9 +722,9 @@ const char* const s_moduleRequireCode = "(function (id){\"use strict\";const exi
 const JSC::ConstructAbility s_moduleRequireResolveCodeConstructAbility = JSC::ConstructAbility::CannotConstruct;
 const JSC::ConstructorKind s_moduleRequireResolveCodeConstructorKind = JSC::ConstructorKind::None;
 const JSC::ImplementationVisibility s_moduleRequireResolveCodeImplementationVisibility = JSC::ImplementationVisibility::Public;
-const int s_moduleRequireResolveCodeLength = 194;
+const int s_moduleRequireResolveCodeLength = 96;
 static const JSC::Intrinsic s_moduleRequireResolveCodeIntrinsic = JSC::NoIntrinsic;
-const char* const s_moduleRequireResolveCode = "(function (id){\"use strict\";try{return @resolveSync(id,typeof this===\"string\"\?this:this\?.path,!1)}catch(error){var e=new Error(`Cannot find module '${id}'`);throw e.code=\"MODULE_NOT_FOUND\",e}})\n";
+const char* const s_moduleRequireResolveCode = "(function (id){\"use strict\";return @resolveSync(id,typeof this===\"string\"\?this:this\?.path,!1)})\n";
 
 // requireNativeModule
 const JSC::ConstructAbility s_moduleRequireNativeModuleCodeConstructAbility = JSC::ConstructAbility::CannotConstruct;