status-im
/
metro
mirror of https://github.com/status-im/metro.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Don't swallow the error if a module require fails 

Reviewed By: davidaurelio

Differential Revision: D4733269

fbshipit-source-id: 2cca14c023b148b62cf24f204cdb355f8d2f3590
This commit is contained in:
Marc Horowitz 2017-03-20 12:56:30 -07:00 committed by Facebook Github Bot
parent e5197e940e
commit 2bec70bf7d
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
packages/metro-bundler/src/Resolver/polyfills/require.js
View File

@ -38,6 +38,7 @@ type ModuleDefinition = {|
exports: Exports, exports: Exports,
factory: FactoryFn, factory: FactoryFn,
hasError: boolean, hasError: boolean,
error?: any,
hot?: HotModuleReloadingData, hot?: HotModuleReloadingData,
isInitialized: boolean, isInitialized: boolean,
verboseName?: string, verboseName?: string,
@ -138,7 +139,7 @@ function loadModuleImplementation(moduleId, module) {
} }
if (module.hasError) { if (module.hasError) {
throw moduleThrewError(moduleId); throw moduleThrewError(moduleId, module.error);
} }
// `require` calls int the require polyfill itself are not analyzed and // `require` calls int the require polyfill itself are not analyzed and
@ -185,6 +186,7 @@ function loadModuleImplementation(moduleId, module) {
return (module.exports = moduleObject.exports); return (module.exports = moduleObject.exports);
} catch (e) { } catch (e) {
module.hasError = true; module.hasError = true;
module.error = e;
module.isInitialized = false; module.isInitialized = false;
module.exports = undefined; module.exports = undefined;
throw e; throw e;
@ -201,9 +203,9 @@ function unknownModuleError(id) {
return Error(message); return Error(message);
} }
function moduleThrewError(id) { function moduleThrewError(id, error: any) {
const displayName = __DEV__ && modules[id] && modules[id].verboseName || id; const displayName = __DEV__ && modules[id] && modules[id].verboseName || id;
return Error('Requiring module "' + displayName + '", which threw an exception.'); return Error('Requiring module "' + displayName + '", which threw an exception: ' + error);
} }
if (__DEV__) { if (__DEV__) {