fix: handle async loading of patch (#739)

gaearon · Dec 28, 2017 · af8bd4b · af8bd4b
1 parent 378b677
commit af8bd4b
Show file tree

Hide file tree

Showing 4 changed files with 198 additions and 43 deletions.
diff --git a/package.json b/package.json
@@ -12,8 +12,8 @@
     "prebuild": "rm -rf packages/*/lib",
     "precommit": "lint-staged",
     "test": "yarn test:es2015 && yarn test:modern",
-    "test:es2015": "BABEL_TARGET=es2015 jest",
-    "test:modern": "BABEL_TARGET=modern jest"
+    "test:es2015": "BABEL_TARGET=es2015 jest --no-cache",
+    "test:modern": "BABEL_TARGET=modern jest --no-cache"
   },
   "lint-staged": {
     "*.{js,md,ts,json}": [

diff --git a/packages/react-hot-loader/src/babel.js b/packages/react-hot-loader/src/babel.js
@@ -31,10 +31,12 @@ module.exports = function plugin(args) {
   const buildTagger = template(
     `
   var UNUSED = (function () {
-    if (typeof __REACT_HOT_LOADER__ === 'undefined') {
-      return;
+    var global = typeof window !== 'undefined' ? window : typeof global !== 'undefined' ? global : {};
+    var __REACT_HOT_LOADER__ = global.__REACT_HOT_LOADER__ || require('react-hot-loader/patch').default;
+    if(!__REACT_HOT_LOADER__){     
+       return;
     }
-
+    
     REGISTRATIONS
   })();
   `,

diff --git a/packages/react-hot-loader/src/patch.dev.js b/packages/react-hot-loader/src/patch.dev.js
@@ -97,3 +97,4 @@ if (typeof global.__REACT_HOT_LOADER__ === 'undefined') {
   React.Children.only = patchedChildOnly
   global.__REACT_HOT_LOADER__ = hooks
 }
+export default hooks