status-im/metro
2
0
Fork 0
mirror of https://github.com/status-im/metro.git synced 2025-02-11 18:47:20 +00:00
Code Issues Projects Releases Wiki Activity

Improve error handling in require-unbundle

Browse Source 
Reviewed By: davidaurelio

Differential Revision: D3207450

fb-gh-sync-id: 35247c265e35976dcee9fca4215403efa604479e
fbshipit-source-id: 35247c265e35976dcee9fca4215403efa604479e
This commit is contained in:
Pieter De Baets 2016-04-22 06:17:17 -07:00 committed by Facebook Github Bot 5
parent 071c175222
commit bdc9749ba0
1 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
react-packager/src/Resolver/polyfills/require-unbundle.js vendored
View File

@ -9,15 +9,11 @@
'use strict';
const {ErrorUtils, nativeRequire} = global;
global.require = require;
global.__d = define;
const modules = Object.create(null);
const loadModule = ErrorUtils ?
guardedLoadModule : loadModuleImplementation;
function define(moduleId, factory) {
if (moduleId in modules) {
// prevent repeated calls to `global.nativeRequire` to overwrite modules
@ -36,20 +32,29 @@ function require(moduleId) {
const module = modules[moduleId];
return module && module.isInitialized
? module.exports
: loadModule(moduleId, module);
: guardedLoadModule(moduleId, module);
}
var inGuard = false;
function guardedLoadModule(moduleId, module) {
try {
if (global.ErrorUtils && !inGuard) {
inGuard = true;
var returnValue;
try {
returnValue = loadModuleImplementation(moduleId, module);
} catch (e) {
global.ErrorUtils.reportFatalError(e);
}
inGuard = false;
return returnValue;
} else {
return loadModuleImplementation(moduleId, module);
} catch (e) {
ErrorUtils.reportFatalError(e);
}
}
function loadModuleImplementation(moduleId, module) {
if (!module) {
nativeRequire(moduleId);
global.nativeRequire(moduleId);
module = modules[moduleId];
}
@ -90,6 +95,7 @@ function loadModuleImplementation(moduleId, module) {
module.isInitialized = false;
module.hasError = true;
module.exports = undefined;
throw e;
}
}