From f58dabc9894775111f4e5a5cf8e17fdfad5fe4e0 Mon Sep 17 00:00:00 2001
From: Bhuwan Khattar <voideanvalue@fb.com>
Date: Thu, 15 Oct 2015 18:27:53 -0700
Subject: [PATCH] Support cyclic dependencies in require polyfill

Reviewed By: @martinbigio

Differential Revision: D2548506

fb-gh-sync-id: fca534179a5f8fcf407917137cdd71d964f145e5
---
 react-packager/src/DependencyResolver/polyfills/require.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/react-packager/src/DependencyResolver/polyfills/require.js b/react-packager/src/DependencyResolver/polyfills/require.js
index 2f9015f6..b674ba4e 100644
--- a/react-packager/src/DependencyResolver/polyfills/require.js
+++ b/react-packager/src/DependencyResolver/polyfills/require.js
@@ -50,12 +50,16 @@
     }
 
     try {
+      // We must optimistically mark mod as initialized before running the factory to keep any
+      // require cycles inside the factory from causing an infinite require loop.
+      mod.isInitialized = true;
+
       // keep args in sync with with defineModuleCode in
       // packager/react-packager/src/DependencyResolver/index.js
       mod.factory.call(global, global, require, mod.module, mod.module.exports);
-      mod.isInitialized = true;
     } catch (e) {
       mod.hasError = true;
+      mod.isInitialized = false;
       throw e;
     }