Merge branch 'wnr-rn57'

drapanjanas · Dec 3, 2018 · 0fe94c0 · 0fe94c0
2 parents a51cde9 + c38327a
commit 0fe94c0
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/resources/figwheel-bridge.js b/resources/figwheel-bridge.js
@@ -152,15 +152,17 @@ function importJs(src, success, error) {
 }
 
 function interceptRequire() {
-    var oldRequire = window.require;
+    var oldRequire = window.__r;
     console.info("Shimming require");
-    window.require = function (id) {
+    function newRequire (id) {
         console.info("Requiring: " + id);
         if (externalModules[id]) {
             return externalModules[id];
         }
         return oldRequire(id);
-    };
+    }
+    window.require = newRequire;
+    window.__r = newRequire;
 }
 
 function serverBaseUrl(host) {