`require` implementation for unbundles: Systrace and guard

Summary:
public

Adds two feature to the require implementation for unbundled code:
- Ports Systrace from `require.js`
- Prevents already loaded modules from being overwritten by repeated calls to `nativeRequire` with the same ID

Reviewed By: martinbigio

Differential Revision: D2850345

fb-gh-sync-id: 122e2d5d4a64b2e868d4cf6e5079810f59b1db18
This commit is contained in:
David Aurelio 2016-01-21 14:10:49 -08:00 committed by facebook-github-bot-3
parent 782d0838be
commit 153989bcd3
1 changed files with 24 additions and 0 deletions

View File

@ -10,6 +10,11 @@ const loadModule = ErrorUtils ?
guardedLoadModule : loadModuleImplementation; guardedLoadModule : loadModuleImplementation;
function define(moduleId, factory) { function define(moduleId, factory) {
if (moduleId in modules) {
// prevent repeated calls to `global.nativeRequire` to overwrite modules
// that are already loaded
return;
}
modules[moduleId] = { modules[moduleId] = {
factory, factory,
hasError: false, hasError: false,
@ -44,11 +49,26 @@ function loadModuleImplementation(moduleId, module) {
throw moduleThrewError(moduleId); throw moduleThrewError(moduleId);
} }
// `require` calls int the require polyfill itself are not analyzed and
// replaced so that they use numeric module IDs.
// The systrace module will expose itself on the require function so that
// it can be used here.
// TODO(davidaurelio) Scan polyfills for dependencies, too (t9759686)
const {Systrace} = require;
const exports = module.exports = {}; const exports = module.exports = {};
const {factory} = module; const {factory} = module;
try { try {
if (__DEV__) {
Systrace.beginEvent('JS_require_' + moduleId);
}
const moduleObject = {exports}; const moduleObject = {exports};
factory(global, require, moduleObject, exports); factory(global, require, moduleObject, exports);
if (__DEV__) {
Systrace.endEvent();
}
return (module.exports = moduleObject.exports); return (module.exports = moduleObject.exports);
} catch (e) { } catch (e) {
module.hasError = true; module.hasError = true;
@ -68,3 +88,7 @@ function unknownModuleError(id) {
function moduleThrewError(id) { function moduleThrewError(id) {
return Error('Requiring module "' + id + '", which threw an exception.'); return Error('Requiring module "' + id + '", which threw an exception.');
} }
if (__DEV__) {
require.Systrace = { beginEvent: () => {}, endEvent: () => {} };
}