merge conflicts

Author: knowbody

CHANGELOG.md

@@ -1,3 +1,38 @@
+v1.0.0-rc2 - Thu, 08 Oct 2015 05:06:02 GMT
+------------------------------------------
+
+- [bdab3d8](../../commit/bdab3d8) [fixed] Compare query by string value
+- [c43fb61](../../commit/c43fb61) [added] <Link hash> prop
+- [24e7b4f](../../commit/24e7b4f) [fixed] isActive on nested IndexLink
+- [160c5ba](../../commit/160c5ba) [fixed] Removed <Link> warning about no history in context
+- [ca9e3b7](../../commit/ca9e3b7) [added] IndexRedirect
+- [428da54](../../commit/428da54) [added] Support <Redirect to="relative/path">
+- [ebb8d20](../../commit/ebb8d20) [fixed] Remove direct calls to createLocation.
+- [fc8a7a4](../../commit/fc8a7a4) [changed] Run examples using HTML5 history
+- [37d9bac](../../commit/37d9bac) [fixed] isActive on <Link onlyActiveOnIndex>
+- [be37196](../../commit/be37196) [fixed] Actually update state when there are transition hooks
+- [b8f1abe](../../commit/b8f1abe) [changed] Removed (un)registerRouteHook
+- [69a9240](../../commit/69a9240) [fixed] Added missing IndexLink to exports
+- [5fbe933](../../commit/5fbe933) [changed] Do not add "active" class by default
+- [85c699c](../../commit/85c699c) [changed] State -> IsActive
+- [94509e7](../../commit/94509e7) [added] IndexLink
+- [adc0a2f](../../commit/adc0a2f) [added] IndexRoute
+- [b86509a](../../commit/b86509a) [added] useRoutes history enhancer [added] RoutingContext component [added] RouteContext mixin [added] Lifecycle mixin
+- [e72812d](../../commit/e72812d) [added] <Router initialState>
+- [4c6dc1b](../../commit/4c6dc1b) [fixed] Installing on Windows
+- [042cffc](../../commit/042cffc) [changed] Removed histories/added history dep
+- [af7eb55](../../commit/af7eb55) [added] History.onBeforeChange
+- [f4ed900](../../commit/f4ed900) [fixed] correctly updates the window scroll position
+- [587e54f](../../commit/587e54f) [added] static `history` singleton getter for `HashHistory` and `BrowserHistory`
+- [5bd62b5](../../commit/5bd62b5) [fixed] errors in examples
+- [4e2ca3c](../../commit/4e2ca3c) [fixed] URI escape path components with special chars
+- [0630488](../../commit/0630488) [fixed] Link module adds extra space
+- [26400c1](../../commit/26400c1) [fixed] Use encodeURI for splat params
+- [178efc3](../../commit/178efc3) [fixed] <Link href> when using HashHistory
+- [41bd525](../../commit/41bd525) [fixed] Properly escape splats
+- [4759961](../../commit/4759961) [fixed] URLUtils recognize values containing \n
+
+
 v0.13.4 - Tue, 06 Oct 2015 13:13:28 GMT
 ---------------------------------------
 

docs/API.md

@@ -85,11 +85,14 @@ A `<Link>` also knows when the route it links to is active and automatically app
 
 #### Props
 ##### `to`
-The path to link to, e.g., `/users/123`.
+The path to link to, e.g. `/users/123`.
 
 ##### `query`
 An object of key:value pairs to be stringified.
 
+##### `hash`
+A hash to put in the URL, e.g. `#a-hash`.
+
 ##### `state`
 State to persist to the `location`.
 

docs/guides/advanced/ServerRendering.md

@@ -16,12 +16,14 @@ It looks something like this with an imaginary JavaScript server:
 ```js
 import { renderToString } from 'react-dom/server'
 import { match, RoutingContext } from 'react-router'
+import createLocation from 'history/lib/createLocation'
 import routes from './routes'
 
 serve((req, res) => {
   // Note that req.url here should be the full URL path from
   // the original request, including the query string.
-  match({ routes, location: req.url }, (error, redirectLocation, renderProps) => {
+  const location = createLocation(req.url);
+  match({ routes, location }, (error, redirectLocation, renderProps) => {
     if (error) {
       res.send(500, error.message)
     } else if (redirectLocation) {

modules/Link.js

@@ -43,12 +43,13 @@ class Link extends React.Component {
   }
 
   static propTypes = {
-    activeStyle: object,
-    activeClassName: string,
-    onlyActiveOnIndex: bool.isRequired,
     to: string.isRequired,
     query: object,
+    hash: string,
     state: object,
+    activeStyle: object,
+    activeClassName: string,
+    onlyActiveOnIndex: bool.isRequired,
     onClick: func
   }
 
@@ -77,16 +78,19 @@ class Link extends React.Component {
   }
 
   render() {
-    const { history } = this.context
-    const { activeClassName, activeStyle, onlyActiveOnIndex, to, query, state, onClick, ...props } = this.props
+    const { to, query, hash, state, activeClassName, activeStyle, onlyActiveOnIndex, ...props } = this.props
 
+    // Manually override onClick.
     props.onClick = (e) => this.handleClick(e)
 
-    // Ignore if rendered outside the context
-    // of history, simplifies unit testing.
+    // Ignore if rendered outside the context of history, simplifies unit testing.
+    const { history } = this.context
     if (history) {
       props.href = history.createHref(to, query)
 
+      if (hash)
+        props.href += hash
+
       if (activeClassName || (activeStyle != null && !isEmptyObject(activeStyle))) {
         if (history.isActive(to, query, onlyActiveOnIndex)) {
           if (activeClassName)

modules/__tests__/Link-test.js

@@ -35,7 +35,7 @@ describe('A <Link>', function () {
   it('knows how to make its href', function () {
     class LinkWrapper extends React.Component {
       render() {
-        return <Link to="/hello/michael" query={{ the: 'query' }}>Link</Link>
+        return <Link to="/hello/michael" query={{ the: 'query' }} hash="#the-hash">Link</Link>
       }
     }
 
@@ -45,7 +45,7 @@ describe('A <Link>', function () {
       </Router>
     ), node, function () {
       const a = node.querySelector('a')
-      expect(a.getAttribute('href')).toEqual('/hello/michael?the=query')
+      expect(a.getAttribute('href')).toEqual('/hello/michael?the=query#the-hash')
     })
   })
 

modules/__tests__/isActive-test.js

@@ -23,7 +23,7 @@ describe('isActive', function () {
     describe('with no query', function () {
       it('is active', function (done) {
         render((
-          <Router history={createHistory('/home')}>
+          <Router history={createHistory('/home?the=query')}>
             <Route path="/home" />
           </Router>
         ), node, function () {
@@ -46,6 +46,19 @@ describe('isActive', function () {
       })
     })
 
+    describe('with a query that also matches by value, but not by type', function () {
+      it('is active', function (done) {
+        render((
+          <Router history={createHistory('/home?the=query&n=2&show=false')}>
+            <Route path="/home" />
+          </Router>
+        ), node, function () {
+          expect(this.history.isActive('/home', { the: 'query', n: 2, show: false })).toBe(true)
+          done()
+        })
+      })
+    })
+
     describe('with a query that does not match', function () {
       it('is not active', function (done) {
         render((

modules/isActive.js

@@ -1,5 +1,28 @@
 import { matchPattern } from './PatternUtils'
-import deepEqual from 'deep-equal'
+
+function deepEqual(a, b) {
+  if (a == b)
+    return true
+
+  if (a == null || b == null)
+    return false
+
+  if (Array.isArray(a)) {
+    return Array.isArray(b) && a.length === b.length && a.every(function (item, index) {
+      return deepEqual(item, b[index])
+    })
+  }
+
+  if (typeof a === 'object') {
+    for (let p in a)
+      if (a.hasOwnProperty(p) && (!b.hasOwnProperty(p) || !deepEqual(a[p], b[p])))
+        return false
+
+    return true
+  }
+
+  return String(a) === String(b)
+}
 
 function paramsAreActive(paramNames, paramValues, activeParams) {
   return paramNames.every(function (paramName, index) {
@@ -11,10 +34,6 @@ function getMatchingRoute(pathname, activeRoutes, activeParams) {
   let route, pattern, basename = ''
   for (let i = 0, len = activeRoutes.length; i < len; ++i) {
     route = activeRoutes[i]
-
-    //if (!route.path)
-    //  return false
-
     pattern = route.path || ''
 
     if (pattern.charAt(0) !== '/')

package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-router",
-  "version": "1.0.0-rc1",
+  "version": "1.0.0-rc2",
   "description": "A complete routing library for React.js",
   "main": "lib/index",
   "repository": {
@@ -25,7 +25,6 @@
   ],
   "license": "MIT",
   "dependencies": {
-    "deep-equal": "^1.0.0",
     "history": "1.12.1",
     "invariant": "^2.0.0",
     "warning": "^2.0.0"
@@ -54,7 +53,7 @@
     "mocha": "^2.0.1",
     "qs": "^4.0.0",
     "react": "0.14.0",
-    "react-addons-test-utils": "^0.14.0",
+    "react-addons-test-utils": "0.14.0",
     "react-dom": "0.14.0",
     "rf-changelog": "^0.4.0",
     "style-loader": "^0.12.4",