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

metro-buck: check validity of segments 

Reviewed By: davidaurelio

Differential Revision: D6496312

fbshipit-source-id: 586dc8d9f64d13cfddaf6bfe768e8f7b3442561a
This commit is contained in:
Jean Lauliac 2017-12-14 09:43:44 -08:00 committed by Facebook Github Bot
parent d2075f3743
commit 86914666e5
2 changed files with 23 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
packages/metro/src/Resolver/polyfills/require.js
View File

@ -160,6 +160,11 @@ function unpackModuleId(
} }
require.unpackModuleId = unpackModuleId; require.unpackModuleId = unpackModuleId;
function packModuleId(value: {segmentId: number, localId: number}): ModuleID {
return value.segmentId << (ID_MASK_SHIFT + value.localId);
}
require.packModuleId = packModuleId;
function loadModuleImplementation(moduleId, module) { function loadModuleImplementation(moduleId, module) {
const nativeRequire = global.nativeRequire; const nativeRequire = global.nativeRequire;
if (!module && nativeRequire) { if (!module && nativeRequire) {

24
packages/metro/src/integration_tests/__tests__/__snapshots__/basic_bundle-test.js.snap
View File

@ -66,15 +66,21 @@ exports[`basic_bundle bundles package with polyfills 1`] = `
_require.unpackModuleId = unpackModuleId; _require.unpackModuleId = unpackModuleId;
function packModuleId(value) {
return value.segmentId << ID_MASK_SHIFT + value.localId;
}
_require.packModuleId = packModuleId;
function loadModuleImplementation(moduleId, module) { function loadModuleImplementation(moduleId, module) {
var nativeRequire = global.nativeRequire; var nativeRequire = global.nativeRequire;
if (!module && nativeRequire) { if (!module && nativeRequire) {
var _unpackModuleId = unpackModuleId(moduleId), var _unpackModuleId = unpackModuleId(moduleId),
segmentId = _unpackModuleId.segmentId, _segmentId = _unpackModuleId.segmentId,
localId = _unpackModuleId.localId; _localId = _unpackModuleId.localId;
nativeRequire(localId, segmentId); nativeRequire(_localId, _segmentId);
module = modules[moduleId]; module = modules[moduleId];
} }
@ -251,15 +257,21 @@ exports[`basic_bundle bundles package without polyfills 1`] = `
_require.unpackModuleId = unpackModuleId; _require.unpackModuleId = unpackModuleId;
function packModuleId(value) {
return value.segmentId << ID_MASK_SHIFT + value.localId;
}
_require.packModuleId = packModuleId;
function loadModuleImplementation(moduleId, module) { function loadModuleImplementation(moduleId, module) {
var nativeRequire = global.nativeRequire; var nativeRequire = global.nativeRequire;
if (!module && nativeRequire) { if (!module && nativeRequire) {
var _unpackModuleId = unpackModuleId(moduleId), var _unpackModuleId = unpackModuleId(moduleId),
segmentId = _unpackModuleId.segmentId, _segmentId = _unpackModuleId.segmentId,
localId = _unpackModuleId.localId; _localId = _unpackModuleId.localId;
nativeRequire(localId, segmentId); nativeRequire(_localId, _segmentId);
module = modules[moduleId]; module = modules[moduleId];
} }