Use named import of 'history' module to fix remix-run#5576. (remix-ru…

…n#5589) * Use named import of 'history' module. * Coding style fixes.
Khan · Aug 29, 2018 · 7dc1264 · 7dc1264
1 parent bbcd472
commit 7dc1264
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 7 deletions.
diff --git a/packages/react-router-dom/modules/BrowserRouter.js b/packages/react-router-dom/modules/BrowserRouter.js
@@ -1,7 +1,7 @@
 import warning from 'warning'
 import React from 'react'
 import PropTypes from 'prop-types'
-import createHistory from 'history/createBrowserHistory'
+import { createBrowserHistory as createHistory } from 'history'
 import Router from './Router'
 
 /**

diff --git a/packages/react-router-dom/modules/HashRouter.js b/packages/react-router-dom/modules/HashRouter.js
@@ -1,7 +1,7 @@
 import warning from 'warning'
 import React from 'react'
 import PropTypes from 'prop-types'
-import createHistory from 'history/createHashHistory'
+import { createHashHistory as createHistory } from 'history'
 import Router from './Router'
 
 /**

diff --git a/packages/react-router/modules/MemoryRouter.js b/packages/react-router/modules/MemoryRouter.js
@@ -1,7 +1,7 @@
 import warning from 'warning'
 import React from 'react'
 import PropTypes from 'prop-types'
-import createHistory from 'history/createMemoryHistory'
+import {createMemoryHistory as createHistory} from 'history'
 import Router from './Router'
 
 /**

diff --git a/packages/react-router/modules/StaticRouter.js b/packages/react-router/modules/StaticRouter.js
@@ -2,7 +2,7 @@ import warning from 'warning'
 import invariant from 'invariant'
 import React from 'react'
 import PropTypes from 'prop-types'
-import { addLeadingSlash, createPath, parsePath } from 'history/PathUtils'
+import { createPath, parsePath } from 'history'
 import Router from './Router'
 
 const normalizeLocation = (object) => {
@@ -15,6 +15,10 @@ const normalizeLocation = (object) => {
   }
 }
 
+const addLeadingSlash = (path) => {
+  return path.charAt(0) === '/' ? path : '/' + path;
+}
+
 const addBasename = (basename, location) => {
   if (!basename)
     return location

diff --git a/packages/react-router/modules/__tests__/Route-test.js b/packages/react-router/modules/__tests__/Route-test.js
@@ -1,6 +1,6 @@
 import React from 'react'
 import ReactDOM from 'react-dom'
-import createMemoryHistory from 'history/createMemoryHistory'
+import { createMemoryHistory } from 'history'
 import MemoryRouter from '../MemoryRouter'
 import Router from '../Router'
 import Route from '../Route'

diff --git a/packages/react-router/modules/__tests__/Router-test.js b/packages/react-router/modules/__tests__/Router-test.js
@@ -2,7 +2,7 @@ import React from 'react'
 import ReactDOM from 'react-dom'
 import PropTypes from 'prop-types'
 import Router from '../Router'
-import createHistory from 'history/createMemoryHistory'
+import { createMemoryHistory as createHistory } from 'history'
 
 describe('A <Router>', () => {
   const node = document.createElement('div')

diff --git a/packages/react-router/modules/__tests__/SwitchMount-test.js b/packages/react-router/modules/__tests__/SwitchMount-test.js
@@ -1,6 +1,6 @@
 import React from 'react'
 import ReactDOM from 'react-dom'
-import createHistory from 'history/createMemoryHistory'
+import { createMemoryHistory as createHistory } from 'history'
 import Router from '../Router'
 import Switch from '../Switch'
 import Route from '../Route'