Add global dep and fix Babel tests

gaearon · May 1, 2016 · fa2b745 · fa2b745
1 parent 55de8a0
commit fa2b745
Show file tree

Hide file tree

Showing 7 changed files with 42 additions and 55 deletions.
diff --git a/package.json b/package.json
@@ -18,6 +18,7 @@
   },
   "dependencies": {
     "babel-template": "^6.7.0",
+    "global": "^4.3.0",
     "react-deep-force-update": "^2.0.1",
     "react-proxy": "^3.0.0-alpha.0",
     "redbox-react": "^1.2.3",

diff --git a/src/babel/index.js b/src/babel/index.js
@@ -4,13 +4,18 @@ const buildRegistration = template('tagSource(ID, NAME);');
 const buildSemi = template(';');
 const buildTagger = template(`
 (function () {
+  if (typeof __REACT_HOT_LOADER__ === 'undefined') {
+    return;
+  }
+
+  var fileName = FILENAME;
   function tagSource(fn, localName) {
     if (typeof fn !== "function") {
       return;
     }
 
-    var id = FILENAME + '#' + localName;
-    __REACT_HOT_LOADER__.set(id, fn);
+    var id = fileName + '#' + localName;
+    __REACT_HOT_LOADER__.register(id, fn);
   }
   REGISTRATIONS
 })();

diff --git a/src/resolveType.js b/src/resolveType.js
@@ -1,9 +1,10 @@
 const createProxy = require('react-proxy').default;
+const global = require('global');
 
 let proxiesByID = {};
 let idsByType = new WeakMap();
 
-window.__REACT_HOT_LOADER__ = {
+global.__REACT_HOT_LOADER__ = {
   set(id, component) {
     idsByType.set(component, id);
   }

diff --git a/src/webpack/tagCommonJSExports.js b/src/webpack/tagCommonJSExports.js
@@ -1,23 +1,18 @@
 ;(function () {
   /* react-hot-loader/webpack */
   if (process.env.NODE_ENV !== 'production') {
+    if (typeof __REACT_HOT_LOADER__ === 'undefined') {
+      return;
+    }
+
+    const fileName = __FILENAME__;
     function tagSource(fn, localName) {
       if (typeof fn !== 'function') {
         return;
       }
-      if (fn.hasOwnProperty('__source')) {
-        return;
-      }
-      try {
-        Object.defineProperty(fn, '__source', {
-          enumerable: false,
-          configurable: true,
-          value: {
-            fileName: __FILENAME__,
-            localName: localName
-          }
-        });
-      } catch (err) { }
+
+      const id = fileName + '#' + localName;
+      __REACT_HOT_LOADER__.register(id, fn);
     }
 
     if (typeof module.exports === 'function') {

diff --git a/test/babel/fixtures/bindings/expected.js b/test/babel/fixtures/bindings/expected.js
@@ -23,25 +23,20 @@ export default _default;
 ;
 
 (function () {
+  if (typeof __REACT_HOT_LOADER__ === 'undefined') {
+    return;
+  }
+
+  var fileName = __FILENAME__;
+
   function tagSource(fn, localName) {
     if (typeof fn !== "function") {
       return;
     }
 
-    if (fn.hasOwnProperty("__source")) {
-      return;
-    }
+    var id = fileName + '#' + localName;
 
-    try {
-      Object.defineProperty(fn, "__source", {
-        enumerable: false,
-        configurable: true,
-        value: {
-          fileName: __FILENAME__,
-          localName: localName
-        }
-      });
-    } catch (err) {}
+    __REACT_HOT_LOADER__.register(id, fn);
   }
 
   tagSource(A, "A");

diff --git a/test/babel/fixtures/counter/expected.js b/test/babel/fixtures/counter/expected.js
@@ -22,25 +22,20 @@ exports.default = _default;
 ;
 
 (function () {
+  if (typeof __REACT_HOT_LOADER__ === 'undefined') {
+    return;
+  }
+
+  var fileName = __FILENAME__;
+
   function tagSource(fn, localName) {
     if (typeof fn !== "function") {
       return;
     }
 
-    if (fn.hasOwnProperty("__source")) {
-      return;
-    }
+    var id = fileName + '#' + localName;
 
-    try {
-      Object.defineProperty(fn, "__source", {
-        enumerable: false,
-        configurable: true,
-        value: {
-          fileName: __FILENAME__,
-          localName: localName
-        }
-      });
-    } catch (err) {}
+    __REACT_HOT_LOADER__.register(id, fn);
   }
 
   tagSource(Counter, "Counter");

diff --git a/test/babel/fixtures/issue-246/expected.js b/test/babel/fixtures/issue-246/expected.js
@@ -14,25 +14,20 @@ function spread() {
 ;
 
 (function () {
+  if (typeof __REACT_HOT_LOADER__ === 'undefined') {
+    return;
+  }
+
+  var fileName = __FILENAME__;
+
   function tagSource(fn, localName) {
     if (typeof fn !== "function") {
       return;
     }
 
-    if (fn.hasOwnProperty("__source")) {
-      return;
-    }
+    var id = fileName + '#' + localName;
 
-    try {
-      Object.defineProperty(fn, "__source", {
-        enumerable: false,
-        configurable: true,
-        value: {
-          fileName: __FILENAME__,
-          localName: localName
-        }
-      });
-    } catch (err) {}
+    __REACT_HOT_LOADER__.register(id, fn);
   }
 
   tagSource(spread, "spread");