Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion modules/History.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import warning from './warning'
import warning from './routerWarning'
import { history } from './PropTypes'

/**
Expand Down
2 changes: 1 addition & 1 deletion modules/IndexRedirect.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import React from 'react'
import warning from './warning'
import warning from './routerWarning'
import invariant from 'invariant'
import Redirect from './Redirect'
import { falsy } from './PropTypes'
Expand Down
2 changes: 1 addition & 1 deletion modules/IndexRoute.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import React from 'react'
import warning from './warning'
import warning from './routerWarning'
import invariant from 'invariant'
import { createRouteFromReactElement } from './RouteUtils'
import { component, components, falsy } from './PropTypes'
Expand Down
2 changes: 1 addition & 1 deletion modules/Lifecycle.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import warning from './warning'
import warning from './routerWarning'
import React from 'react'
import invariant from 'invariant'

Expand Down
2 changes: 1 addition & 1 deletion modules/Link.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import React from 'react'
import warning from './warning'
import warning from './routerWarning'

const { bool, object, string, func, oneOfType } = React.PropTypes

Expand Down
2 changes: 1 addition & 1 deletion modules/RouteContext.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import warning from './warning'
import warning from './routerWarning'
import React from 'react'

const { object } = React.PropTypes
Expand Down
2 changes: 1 addition & 1 deletion modules/RouteUtils.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import React from 'react'
import warning from './warning'
import warning from './routerWarning'

function isValidChild(object) {
return object == null || React.isValidElement(object)
Expand Down
2 changes: 1 addition & 1 deletion modules/Router.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import { routes } from './PropTypes'
import RouterContext from './RouterContext'
import { createRoutes } from './RouteUtils'
import { createRouterObject, createRoutingHistory } from './RouterUtils'
import warning from './warning'
import warning from './routerWarning'

function isDeprecatedHistory(history) {
return !history || !history.__v2_compatible__
Expand Down
2 changes: 1 addition & 1 deletion modules/RouterContext.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import React from 'react'
import deprecateObjectProperties from './deprecateObjectProperties'
import getRouteParams from './getRouteParams'
import { isReactChildren } from './RouteUtils'
import warning from './warning'
import warning from './routerWarning'

const { array, func, object } = React.PropTypes

Expand Down
2 changes: 1 addition & 1 deletion modules/RoutingContext.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React from 'react'
import RouterContext from './RouterContext'
import warning from './warning'
import warning from './routerWarning'

const RoutingContext = React.createClass({
componentWillMount() {
Expand Down
2 changes: 1 addition & 1 deletion modules/TransitionUtils.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { loopAsync } from './AsyncUtils'
import warning from './warning'
import warning from './routerWarning'

function createEnterHook(hook, route) {
return function (a, b, callback) {
Expand Down
2 changes: 1 addition & 1 deletion modules/createTransitionManager.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import warning from './warning'
import warning from './routerWarning'
import { REPLACE } from 'history/lib/Actions'
import computeChangedRoutes from './computeChangedRoutes'
import { runEnterHooks, runLeaveHooks } from './TransitionUtils'
Expand Down
2 changes: 1 addition & 1 deletion modules/deprecateObjectProperties.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*eslint no-empty: 0*/
import warning from './warning'
import warning from './routerWarning'

let useMembrane = false

Expand Down
2 changes: 1 addition & 1 deletion modules/matchRoutes.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import warning from './warning'
import warning from './routerWarning'
import { loopAsync } from './AsyncUtils'
import { matchPattern } from './PatternUtils'
import { createRoutes } from './RouteUtils'
Expand Down
File renamed without changes.
2 changes: 1 addition & 1 deletion modules/useRoutes.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import useQueries from 'history/lib/useQueries'

import createTransitionManager from './createTransitionManager'
import warning from './warning'
import warning from './routerWarning'

/**
* Returns a new createHistory function that may be used to create
Expand Down