Move canUseDOM in with DOMUtils

remix-run · Feb 26, 2017 · 785f2e5 · 785f2e5
1 parent f009c7a
commit 785f2e5
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 9 deletions.
diff --git a/modules/DOMUtils.js b/modules/DOMUtils.js
@@ -1,3 +1,7 @@
+export const canUseDOM = !!(
+  typeof window !== 'undefined' && window.document && window.document.createElement
+)
+
 export const addEventListener = (node, event, listener) =>
   node.addEventListener
     ? node.addEventListener(event, listener, false)

diff --git a/modules/ExecutionEnvironment.js b/modules/ExecutionEnvironment.js
diff --git a/modules/__tests__/BrowserHistory-test.js b/modules/__tests__/BrowserHistory-test.js
@@ -1,6 +1,5 @@
 import createHistory from '../createBrowserHistory'
-import { canUseDOM } from '../ExecutionEnvironment'
-import { supportsHistory } from '../DOMUtils'
+import { canUseDOM, supportsHistory } from '../DOMUtils'
 import * as TestSequences from './TestSequences'
 
 const canUseHistory = canUseDOM && supportsHistory()

diff --git a/modules/__tests__/HashHistory-test.js b/modules/__tests__/HashHistory-test.js
@@ -1,6 +1,5 @@
 import createHistory from '../createHashHistory'
-import { canUseDOM } from '../ExecutionEnvironment'
-import { supportsGoWithoutReloadUsingHash } from '../DOMUtils'
+import { canUseDOM, supportsGoWithoutReloadUsingHash } from '../DOMUtils'
 import * as TestSequences from './TestSequences'
 
 const describeHistory = canUseDOM ? describe : describe.skip

diff --git a/modules/createBrowserHistory.js b/modules/createBrowserHistory.js
@@ -9,8 +9,8 @@ import {
   createPath
 } from './PathUtils'
 import createTransitionManager from './createTransitionManager'
-import { canUseDOM } from './ExecutionEnvironment'
 import {
+  canUseDOM,
   addEventListener,
   removeEventListener,
   getConfirmation,

diff --git a/modules/createHashHistory.js b/modules/createHashHistory.js
@@ -10,8 +10,8 @@ import {
   createPath
 } from './PathUtils'
 import createTransitionManager from './createTransitionManager'
-import { canUseDOM } from './ExecutionEnvironment'
 import {
+  canUseDOM,
   addEventListener,
   removeEventListener,
   getConfirmation,