Merge pull request #103 from tbvjaos510/master

Replace isNode to isBrowser check for SSR check

Author: theKashey

package-lock.json

@@ -82,7 +82,7 @@
   "dependencies": {
     "@babel/runtime": "^7.3.1",
     "crc-32": "^1.2.0",
-    "detect-node": "^2.0.3",
+    "detect-node": "^2.0.4",
     "prop-types": "15.6.2",
     "scan-directory": "^1.0.0"
   },

package.json

@@ -1,9 +1,9 @@
 import React, {Component} from 'react';
 import PropTypes from 'prop-types';
-import isNode from 'detect-node';
 import {useMark} from './marks';
 import toLoadable from "./loadable";
 import {UIDConsumer} from "./context";
+import isBackend from './detectBackend';
 
 const STATE_LOADING = 'loading';
 const STATE_ERROR = 'error';
@@ -16,7 +16,7 @@ FragmentNode.propTypes = {
 
 export const settings = {
   hot: !!module.hot,
-  SSR: isNode
+  SSR: isBackend
 };
 
 const getLoadable = importFunction => {
@@ -38,7 +38,7 @@ export class UnconnectedReactImportedComponent extends Component {
     loadable.load().catch(() => ({}));
     this.state.mark = loadable.mark;
 
-    if (isNode && settings.SSR && typeof this.props.streamId !== 'undefined') {
+    if (isBackend && settings.SSR && typeof this.props.streamId !== 'undefined') {
       useMark(this.props.streamId, loadable.mark);
       if (this.state.state !== STATE_DONE) {
         this.state.state = STATE_LOADING;

src/Component.js

@@ -1,10 +1,10 @@
 import React from 'react';
 import PropTypes from 'prop-types';
-import isNode from 'detect-node';
+import isBackend from './detectBackend';
 
 const LazyBoundary = ({children}) => <React.Fragment>{children}</React.Fragment>;
 LazyBoundary.propTypes = {
   children: PropTypes.node,
 };
 
-export default isNode ? LazyBoundary : React.Suspense;
+export default isBackend ? LazyBoundary : React.Suspense;

src/LazyBoundary.js

@@ -0,0 +1,5 @@
+import isNodeDetected from 'detect-node';
+
+const isBackend = isNodeDetected || (typeof window === 'undefined');
+
+export default isBackend;

src/detectBackend.js

@@ -1,5 +1,5 @@
-import isNode from 'detect-node';
 import {loadMark} from './marks';
+import isBackend from './detectBackend';
 
 let pending = [];
 
@@ -66,7 +66,8 @@ const toLoadable = (importFunction, autoImport = true) => {
     mark.forEach(subMark => loadMark(subMark, loadable))
   }
 
-  if (isNode && autoImport) {
+  if (
+    isBackend && autoImport) {
     loadable.load();
   }
   return loadable;

src/loadable.js

@@ -2635,10 +2635,10 @@ detect-libc@^1.0.2:
   resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-1.0.3.tgz#fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b"
   integrity sha1-+hN8S9aY7fVc1c0CrFWfkaTEups=
 
-detect-node@^2.0.3:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/detect-node/-/detect-node-2.0.3.tgz#a2033c09cc8e158d37748fbde7507832bd6ce127"
-  integrity sha1-ogM8CcyOFY03dI+951B4Mr1s4Sc=
+detect-node@^2.0.4:
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/detect-node/-/detect-node-2.0.4.tgz#014ee8f8f669c5c58023da64b8179c083a28c46c"
+  integrity sha512-ZIzRpLJrOj7jjP2miAtgqIfmzbxa4ZOr5jJc601zklsfEx9oTzmmj2nVpIPRpNlRTIh8lc1kyViIY7BWSGNmKw==
 
 diff@3.5.0, diff@^3.5.0:
   version "3.5.0"