From 19412af7de724569d34da235173151979868576c Mon Sep 17 00:00:00 2001 From: Jean Lauliac Date: Wed, 20 Mar 2019 11:20:07 -0700 Subject: [PATCH] metro/require: remove hooks Reviewed By: motiz88 Differential Revision: D14523129 fbshipit-source-id: 6d87e3ed8c3485d0a82ee0b0db08ed436471d629 --- .../lib/polyfills/__tests__/require-test.js | 30 ------------------- packages/metro/src/lib/polyfills/require.js | 23 -------------- 2 files changed, 53 deletions(-) diff --git a/packages/metro/src/lib/polyfills/__tests__/require-test.js b/packages/metro/src/lib/polyfills/__tests__/require-test.js index a04b9c76d4..67f3743680 100644 --- a/packages/metro/src/lib/polyfills/__tests__/require-test.js +++ b/packages/metro/src/lib/polyfills/__tests__/require-test.js @@ -413,36 +413,6 @@ describe('require', () => { 'Unknown named module: "wrong.js"', ); }); - - it('calls the hooks when module is required', () => { - createModuleSystem(moduleSystem, false); - - const received = []; - const hook = moduleSystem.__r.registerHook((moduleId, module) => { - received.push([moduleId, module]); - }); - createModule( - moduleSystem, - 0, - 'index.js', - (global, require, _1, _2, module) => { - module.exports = 'foo'; - }, - ); - createModule( - moduleSystem, - 1, - 'bar.js', - (global, require, _1, _2, module) => { - module.exports = 'bar'; - }, - ); - - expect(moduleSystem.__r(0)).toEqual('foo'); - hook.release(); - expect(moduleSystem.__r(1)).toEqual('bar'); - expect(received).toEqual([[0, {exports: 'foo', id: 0}]]); - }); }); describe('clearing require cache', () => { diff --git a/packages/metro/src/lib/polyfills/require.js b/packages/metro/src/lib/polyfills/require.js index a759c0658e..fc6d1484b5 100644 --- a/packages/metro/src/lib/polyfills/require.js +++ b/packages/metro/src/lib/polyfills/require.js @@ -283,23 +283,6 @@ function packModuleId(value: {localId: number, segmentId: number}): ModuleID { } metroRequire.packModuleId = packModuleId; -const hooks = []; -function registerHook(cb: (number, {}) => void): {|release: () => void|} { - const hook = {cb}; - hooks.push(hook); - return { - release: (): void => { - for (let i = 0; i < hooks.length; ++i) { - if (hooks[i] === hook) { - hooks.splice(i, 1); - break; - } - } - }, - }; -} -metroRequire.registerHook = registerHook; - const moduleDefinersBySegmentID = []; function registerSegment(segmentID, moduleDefiner): void { @@ -367,12 +350,6 @@ function loadModuleImplementation( } moduleObject.id = moduleId; - if (hooks.length > 0) { - for (let i = 0; i < hooks.length; ++i) { - hooks[i].cb(moduleId, moduleObject); - } - } - // keep args in sync with with defineModuleCode in // metro/src/Resolver/index.js // and metro/src/ModuleGraph/worker.js