Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: remix-run/react-router
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v4.2.0
Choose a base ref
...
head repository: remix-run/react-router
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: v4.3.0
Choose a head ref
62 contributors

Commits on Jun 4, 2017

  1. adds redirect with parameters + tests + docs

    @dlindenkreuz
    dlindenkreuz committed Jun 4, 2017
    Copy the full SHA
    ca77611 View commit details

Commits on Aug 24, 2017

  1. Missing warning dep

    @timdorr
    timdorr committed Aug 24, 2017
    Copy the full SHA
    a1140e4 View commit details

Commits on Aug 25, 2017

  1. react-router-dom 4.2.1

    @timdorr
    timdorr committed Aug 25, 2017
    Copy the full SHA
    5def29e View commit details

  2. Resolve to local react-router for UMD

    @timdorr
    timdorr committed Aug 25, 2017
    Copy the full SHA
    55bda9e View commit details

  3. react-router-dom 4.2.2

    @timdorr
    timdorr committed Aug 25, 2017
    Copy the full SHA
    f0e2c49 View commit details

Commits on Aug 26, 2017

  1. Remove the big ternary

    @timdorr
    timdorr committed Aug 26, 2017
    6
    Copy the full SHA
    59a4fbc View commit details

  2. Fixing misleading comment (#5468) 

    `button` 0 is the left mouse button, but there is more than one other kind of button: https://developer.mozilla.org/en-US/docs/Web/API/MouseEvent/button#Return_value
    @TehShrike @timdorr
    TehShrike authored and timdorr committed Aug 26, 2017
    Copy the full SHA
    7585419 View commit details

Commits on Sep 11, 2017

  1. Use match.path for nested routes. (#5506) 

    #### This change seeks to attain uniformity in the docs.

[The API docs for `match`](https://github.com/ReactTraining/react-router/blob/0b9917e02391809f6ef12c10a29c75ee0e20efe5/packages/react-router/docs/api/match.md) distinguishes between `match.url` and `match.path`, recommending that `.url` be used for building nested <Link>s and `.path` for building nested <Route>s.

However, the example code in this _Quick Start_ guide uses `match.url` to nest Routes.
    @adeolabadmus @timdorr
    adeolabadmus authored and timdorr committed Sep 11, 2017
    Copy the full SHA
    c5fb25d View commit details

Commits on Sep 12, 2017

  1. Update docs and example to use BackButton (#5513)

    @coreh @timdorr
    coreh authored and timdorr committed Sep 12, 2017
    Copy the full SHA
    f27f9de View commit details

Commits on Sep 14, 2017

  1. Use yarn workspaces and move website to repo root 

    This should provide much faster install times and easier access to the
website for people who want to contribute.

Fixes #4362
    @mjackson
    mjackson committed Sep 14, 2017
    Copy the full SHA
    8c012ee View commit details

  2. Remove npm package lockfile

    @mjackson
    mjackson committed Sep 14, 2017
    Copy the full SHA
    f000787 View commit details

  3. Update start script

    @mjackson
    mjackson committed Sep 14, 2017
    Copy the full SHA
    cc0e732 View commit details

Commits on Sep 15, 2017

  1. Whitespace tweaks

    @mjackson
    mjackson committed Sep 15, 2017
    Copy the full SHA
    a1bb5ce View commit details

  2. Add .yarnrc so yarn workspaces work on Travis

    @mjackson
    mjackson committed Sep 15, 2017
    Copy the full SHA
    d24dd20 View commit details

  3. Revert the switch to yarn workspaces :'( 

    The react-router-native tests don't pass anymore on master, so I'm
reverting this until we can figure out why.

Re-opens #4362
    @mjackson
    mjackson committed Sep 15, 2017
    Copy the full SHA
    bb4f983 View commit details

  4. Move website into repo root 

    Closes #5525
    @mjackson
    mjackson committed Sep 15, 2017
    Copy the full SHA
    c94bcd8 View commit details

  5. Update website cache location

    @mjackson
    mjackson committed Sep 15, 2017
    Copy the full SHA
    cd49005 View commit details

  6. there is a typo (#5530) 

    precedence has been written incorrectly.
    @jsina @timdorr
    jsina authored and timdorr committed Sep 15, 2017
    Copy the full SHA
    e42c968 View commit details

  7. Update to lerna 2.2.0

    @mjackson
    mjackson committed Sep 15, 2017
    Copy the full SHA
    4dd0b50 View commit details

Commits on Sep 17, 2017

  1. Update scroll-restoration.md (#5532)

    @timdorr
    Mohamed Ismat authored and timdorr committed Sep 17, 2017
    Copy the full SHA
    dfdcfac View commit details

Commits on Sep 18, 2017

  1. Regenerate package locks

    @mjackson
    mjackson committed Sep 18, 2017
    Copy the full SHA
    f77440e View commit details

Commits on Sep 20, 2017

  1. fixed brace to curly brace in example (#5541)

    @igorline @timdorr
    igorline authored and timdorr committed Sep 20, 2017
    Copy the full SHA
    7c04819 View commit details

Commits on Sep 22, 2017

  1. react-router-redux useful selectors (#5543) 

    * add feature

* Remove an extra linebreak

* add tests

* use === instead of deep comparison

* remove duplicated test

* remove unused var
    @eloytoro @timdorr
    eloytoro authored and timdorr committed Sep 22, 2017
    Copy the full SHA
    6a5d48b View commit details

Commits on Sep 26, 2017

  1. Update react-router-redux readme to reflect versioning situation. (#5560 

    )
    @joearasin @timdorr
    joearasin authored and timdorr committed Sep 26, 2017
    Copy the full SHA
    67d7978 View commit details

Commits on Sep 28, 2017

  1. Ignore the website in CI

    @mjackson
    mjackson committed Sep 28, 2017
    Copy the full SHA
    867e9f1 View commit details

  2. Update Travis config

    @mjackson
    mjackson committed Sep 28, 2017
    Copy the full SHA
    77352a8 View commit details

  3. Merge branch 'feature/redirect-with-params' of https://github.com/dli… 

    …ndenkreuz/react-router into dlindenkreuz-feature/redirect-with-params
    @mjackson
    mjackson committed Sep 28, 2017
    Copy the full SHA
    b36cfcc View commit details

Commits on Sep 29, 2017

  1. Add test for <Redirect> param interpolation

    @mjackson
    mjackson committed Sep 29, 2017
    Copy the full SHA
    f964e00 View commit details

Commits on Oct 3, 2017

  1. Add a basic components guide (#4926) 

    * Add a basic components guide

This covers the basic components that should be known by a user in order to create a react-router-dom application

* Expand on <Route> render props

* Mention inline functions

* Fix typo

* Add to guides array in new location
    @pshrmn @timdorr
    pshrmn authored and timdorr committed Oct 3, 2017
    Copy the full SHA
    5e763c5 View commit details

  2. Adds a note & link to Redux blocked updates (#5552) 

    * Adds a note & link to Redux blocked updates

I read this doc like four times until I decided to click on the breadcrumbs for other guides.  Lo and behold, I found and solved my problem within 30 seconds.  This PR helps others avoid my situation because it indicates that they should also read the other Redux guide if they are experiencing blocked updates.

* Update blocked-updates.md

* Adds more explanation & example

* Bolds text
    @benjaminhoffman @timdorr
    benjaminhoffman authored and timdorr committed Oct 3, 2017
    Copy the full SHA
    bcf8cb9 View commit details

  3. Add basic working examples to react-router-redux (#5512)

    @SadPandaBear @timdorr
    SadPandaBear authored and timdorr committed Oct 3, 2017

    Unverified

    This commit is not signed, but one or more authors requires that any commit attributed to them is signed.
    Learn about vigilant mode
    Copy the full SHA
    6d28a2e View commit details

  4. Fix <Link to="string"> (#5489) 

    * Fix <Link to="string">

New implementation will parse the string to create an actual location object. This also means that a to string with no pathname will resolve using the current location.

The "href" value is also now stored in state, only recalculating it when the "to" prop changes.

* Determine href in render

* Style tweaks
    @pshrmn @timdorr
    pshrmn authored and timdorr committed Oct 3, 2017

    Unverified

    This commit is not signed, but one or more authors requires that any commit attributed to them is signed.
    Learn about vigilant mode
    Copy the full SHA
    be6fb6d View commit details

  5. update readme to clarify pathname (#5066) 

    * update readme to clarify pathname

* updating per pr feedback

* blank line
    @kellyrmilligan @timdorr
    kellyrmilligan authored and timdorr committed Oct 3, 2017

    Unverified

    This commit is not signed, but one or more authors requires that any commit attributed to them is signed.
    Learn about vigilant mode
    Copy the full SHA
    819b6ac View commit details

Commits on Oct 5, 2017

  1. Style tweak

    @mjackson
    mjackson committed Oct 5, 2017

    Unverified

    This commit is not signed, but one or more authors requires that any commit attributed to them is signed.
    Learn about vigilant mode
    Copy the full SHA
    1006945 View commit details

  2. Document Route sensitive option (#5592)

    @Kmaschta @timdorr
    Kmaschta authored and timdorr committed Oct 5, 2017

    Unverified

    This commit is not signed, but one or more authors requires that any commit attributed to them is signed.
    Learn about vigilant mode
    Copy the full SHA
    08dfc5e View commit details

Commits on Oct 6, 2017

  1. Escape NavLink path to allow special characters in path. Fixes #5584 (#… 

    …5596)

* Escape NavLink path to allow special characters in path.  Fixes #5584

* Simplify to ternary
    @esiegel @timdorr
    esiegel authored and timdorr committed Oct 6, 2017

    Unverified

    This commit is not signed, but one or more authors requires that any commit attributed to them is signed.
    Learn about vigilant mode
    Copy the full SHA
    c3d453e View commit details

Commits on Oct 18, 2017

  1. Upgrade deps and rollup config for react-router-redux

    @timdorr
    timdorr committed Oct 18, 2017

    Unverified

    This commit is not signed, but one or more authors requires that any commit attributed to them is signed.
    Learn about vigilant mode
    Copy the full SHA
    06d5661 View commit details

  2. Update deps and fix for various problems. 

    Temp fixes for error boundaries until facebook/react#11098 is resolved.
    @timdorr
    timdorr committed Oct 18, 2017

    Unverified

    This commit is not signed, but one or more authors requires that any commit attributed to them is signed.
    Learn about vigilant mode
    Copy the full SHA
    7450ce0 View commit details

  3. RRR published as 5.0.0-alpha.7

    @timdorr
    timdorr authored Oct 18, 2017

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    5182123 View commit details

Commits on Oct 19, 2017

  1. Update package.json (#5638)

    @halkeye @timdorr
    halkeye authored and timdorr committed Oct 19, 2017

    Unverified

    This commit is not signed, but one or more authors requires that any commit attributed to them is signed.
    Learn about vigilant mode
    Copy the full SHA
    b835c8f View commit details

  2. RRR 5.0.0-alpha.8

    @timdorr
    timdorr committed Oct 19, 2017

    Unverified

    This commit is not signed, but one or more authors requires that any commit attributed to them is signed.
    Learn about vigilant mode
    Copy the full SHA
    d6ac814 View commit details

Commits on Oct 24, 2017

  1. react-router-redux/createMatchSelector: handle null case when router … 

    …state is not yet initialized (#5653)

* react-router-redux/createMatchSelector: handle null case when router state is not yet initialized

* react-router-redux/createMatchSelector: test coverage for 4a826fa

* tests/createMatchSelector: fixed assertion in test

* Made test assertion a little more useful/semantic
    @timdorr
    Brendan Stromberger authored and timdorr committed Oct 24, 2017

    Unverified

    This commit is not signed, but one or more authors requires that any commit attributed to them is signed.
    Learn about vigilant mode
    Copy the full SHA
    fd85fbc View commit details

Commits on Oct 30, 2017

  1. Fix some code splitting docs inconsistencies.

    @timdorr
    timdorr authored Oct 30, 2017

    Unverified

    This commit is not signed, but one or more authors requires that any commit attributed to them is signed.
    Learn about vigilant mode
    Copy the full SHA
    d972088 View commit details

Commits on Nov 1, 2017

  1. Fix link to location.md (#5676) 

    The `./` there is important to give the correct link when rendered
    @chtseac @timdorr
    chtseac authored and timdorr committed Nov 1, 2017

    Unverified

    This commit is not signed, but one or more authors requires that any commit attributed to them is signed.
    Learn about vigilant mode
    Copy the full SHA
    93cdf94 View commit details

Commits on Nov 2, 2017

  1. fix: wrong path of require (#5681)

    @noscripter @timdorr
    noscripter authored and timdorr committed Nov 2, 2017

    Unverified

    This commit is not signed, but one or more authors requires that any commit attributed to them is signed.
    Learn about vigilant mode
    Copy the full SHA
    5470fad View commit details

Commits on Nov 6, 2017

  1. Updated react-transition-group and changed Animation.js example (#5691) 

    *  Updated to react-transition-group 2.2.1;
*  Changed implementation in example Animation.js
    @thommymo @timdorr
    thommymo authored and timdorr committed Nov 6, 2017

    Unverified

    This commit is not signed, but one or more authors requires that any commit attributed to them is signed.
    Learn about vigilant mode
    Copy the full SHA
    db1900a View commit details

Commits on Nov 7, 2017

  1. fix small typo (#5695)

    @AndreiRailean @timdorr
    AndreiRailean authored and timdorr committed Nov 7, 2017

    Unverified

    This commit is not signed, but one or more authors requires that any commit attributed to them is signed.
    Learn about vigilant mode
    Copy the full SHA
    f8887ad View commit details

Commits on Nov 8, 2017

  1. Expose generatePath (#5661) 

    * Expose generatePath

* Update package.json

* Update index.js

* Create generatePath.js
    @rybon @timdorr
    rybon authored and timdorr committed Nov 8, 2017
    Copy the full SHA
    7cda4bd View commit details

Commits on Nov 9, 2017

  1. added a much needed comma! (#5711)

    @joordas @timdorr
    joordas authored and timdorr committed Nov 9, 2017

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    db597b2 View commit details

Commits on Nov 10, 2017

  1. Improvements to react-router-redux examples (#5647) 

    * general improvements to react-router-redux examples

* remove unnecessary arrow function

* use Redirect for private route
    @renanpvaz @timdorr
    renanpvaz authored and timdorr committed Nov 10, 2017

    Unverified

    This commit is not signed, but one or more authors requires that any commit attributed to them is signed.
    Learn about vigilant mode
    Copy the full SHA
    c47ffd7 View commit details
Showing with 50,024 additions and 26,386 deletions.
  1. +25 −0 .github/lock.yml
  2. +2 −0 .prettierignore
  3. +9 −9 .travis.yml
  4. 0 .watchmanconfig
  5. +201 −147 CHANGES.md
  6. +41 −2 CONTRIBUTING.md
  7. +3 −2 ISSUE_TEMPLATE.md
  8. +2 −2 LICENSE.md → LICENSE
  9. +8 −12 README.md
  10. +0 −6 SPONSORS.md
  11. +3 −2 lerna.json
  12. +1,370 −810 package-lock.json
  13. +8 −4 package.json
  14. +9 −5 packages/react-router-config/README.md
  15. +2 −6 packages/react-router-config/modules/.eslintrc
  16. +86 −86 packages/react-router-config/modules/__tests__/integration-test.js
  17. +60 −66 packages/react-router-config/modules/__tests__/matchRoutes-test.js
  18. +305 −232 packages/react-router-config/modules/__tests__/renderRoutes-test.js
  19. +2 −2 packages/react-router-config/modules/index.js
  20. +13 −13 packages/react-router-config/modules/matchRoutes.js
  21. +20 −19 packages/react-router-config/modules/renderRoutes.js
  22. +5,358 −2,080 packages/react-router-config/package-lock.json
  23. +28 −20 packages/react-router-config/package.json
  24. +27 −24 packages/react-router-config/rollup.config.js
  25. +15 −19 packages/react-router-config/tools/babel-preset.js
  26. +3 −3 packages/react-router-dom/README.md
  27. +5 −5 packages/react-router-dom/docs/api/BrowserRouter.md
  28. +3 −3 packages/react-router-dom/docs/api/HashRouter.md
  29. +11 −7 packages/react-router-dom/docs/api/Link.md
  30. +6 −6 packages/react-router-dom/docs/api/NavLink.md
  31. +114 −0 packages/react-router-dom/docs/guides/basic-components.md
  32. +14 −46 packages/react-router-dom/docs/guides/code-splitting.md
  33. +2 −2 packages/react-router-dom/docs/guides/quick-start.md
  34. +2 −2 packages/react-router-dom/docs/guides/scroll-restoration.md
  35. +8 −8 packages/react-router-dom/docs/guides/server-rendering.md
  36. +2 −6 packages/react-router-dom/modules/.eslintrc
  37. +12 −12 packages/react-router-dom/modules/BrowserRouter.js
  38. +13 −13 packages/react-router-dom/modules/HashRouter.js
  39. +35 −34 packages/react-router-dom/modules/Link.js
  40. +2 −2 packages/react-router-dom/modules/MemoryRouter.js
  41. +49 −31 packages/react-router-dom/modules/NavLink.js
  42. +2 −2 packages/react-router-dom/modules/Prompt.js
  43. +2 −2 packages/react-router-dom/modules/Redirect.js
  44. +2 −2 packages/react-router-dom/modules/Route.js
  45. +2 −2 packages/react-router-dom/modules/Router.js
  46. +2 −2 packages/react-router-dom/modules/StaticRouter.js
  47. +2 −2 packages/react-router-dom/modules/Switch.js
  48. +30 −31 packages/react-router-dom/modules/__tests__/BrowserRouter-test.js
  49. +30 −31 packages/react-router-dom/modules/__tests__/HashRouter-test.js
  50. +123 −83 packages/react-router-dom/modules/__tests__/Link-test.js
  51. +434 −276 packages/react-router-dom/modules/__tests__/NavLink-test.js
  52. +3 −0 packages/react-router-dom/modules/generatePath.js
  53. +14 −13 packages/react-router-dom/modules/index.js
  54. +2 −2 packages/react-router-dom/modules/matchPath.js
  55. +2 −2 packages/react-router-dom/modules/withRouter.js
  56. +5,348 −2,077 packages/react-router-dom/package-lock.json
  57. +32 −22 packages/react-router-dom/package.json
  58. +24 −19 packages/react-router-dom/rollup.config.js
  59. +27 −24 packages/react-router-dom/tools/babel-preset.js
  60. +13 −13 packages/react-router-native/BackButton.js
  61. +17 −18 packages/react-router-native/DeepLinking.js
  62. +17 −21 packages/react-router-native/Link.js
  63. +12 −14 packages/react-router-native/NativeRouter.js
  64. +0 −27 packages/react-router-native/docs/api/AndroidBackButton.md
  65. +27 −0 packages/react-router-native/docs/api/BackButton.md
  66. +1 −1 packages/react-router-native/docs/api/DeepLinking.md
  67. +6 −6 packages/react-router-native/docs/api/Link.md
  68. +3 −3 packages/react-router-native/docs/api/NativeRouter.md
  69. +4 −4 packages/react-router-native/docs/guides/animation.md
  70. +49 −40 packages/react-router-native/index.android.js
  71. +4 −4 packages/react-router-native/index.ios.js
  72. +6 −6 packages/react-router-native/main.js
  73. +7,574 −3,410 packages/react-router-native/package-lock.json
  74. +10 −9 packages/react-router-native/package.json
  75. +16 −10 packages/react-router-native/rn-cli.config.js
  76. +2 −6 packages/react-router-redux/.eslintrc
  77. +7 −2 packages/react-router-redux/README.md
  78. +123 −0 packages/react-router-redux/examples/AuthExample.js
  79. +41 −0 packages/react-router-redux/examples/BasicExample.js
  80. +25 −22 packages/react-router-redux/modules/ConnectedRouter.js
  81. +107 −52 packages/react-router-redux/modules/__tests__/ConnectedRouter-test.js
  82. +65 −59 packages/react-router-redux/modules/__tests__/actions-test.js
  83. +20 −21 packages/react-router-redux/modules/__tests__/middleware-test.js
  84. +49 −50 packages/react-router-redux/modules/__tests__/reducer-test.js
  85. +124 −0 packages/react-router-redux/modules/__tests__/selectors-test.js
  86. +8 −9 packages/react-router-redux/modules/actions.js
  87. +10 −5 packages/react-router-redux/modules/index.js
  88. +5 −5 packages/react-router-redux/modules/middleware.js
  89. +8 −5 packages/react-router-redux/modules/reducer.js
  90. +21 −0 packages/react-router-redux/modules/selectors.js
  91. +6,171 −2,259 packages/react-router-redux/package-lock.json
  92. +25 −23 packages/react-router-redux/package.json
  93. +17 −19 packages/react-router-redux/rollup.config.js
  94. +0 −9 packages/react-router-website/modules/LoadServiceWorker.js
  95. +0 −6 packages/react-router-website/modules/Theme.js
  96. +0 −105 packages/react-router-website/modules/animated/bezier.js
  97. +0 −43 packages/react-router-website/modules/components/API.js
  98. +0 −46 packages/react-router-website/modules/components/APISmall.js
  99. +0 −28 packages/react-router-website/modules/components/App.js
  100. +0 −32 packages/react-router-website/modules/components/Bundle.js
  101. +0 −39 packages/react-router-website/modules/components/DelegateMarkdownLinks.js
  102. +0 −68 packages/react-router-website/modules/components/Environment.js
  103. +0 −81 packages/react-router-website/modules/components/EnvironmentHeader.js
  104. +0 −42 packages/react-router-website/modules/components/Example.js
  105. +0 −143 packages/react-router-website/modules/components/FakeBrowser.js
  106. +0 −44 packages/react-router-website/modules/components/Guide.js
  107. +0 −144 packages/react-router-website/modules/components/Home/Header.js
  108. +0 −14 packages/react-router-website/modules/components/Home/index.js
  109. +0 −22 packages/react-router-website/modules/components/Logo.js
  110. +0 −56 packages/react-router-website/modules/components/NativeExample.js
  111. +0 −156 packages/react-router-website/modules/components/NewsletterSignup.js
  112. +0 −123 packages/react-router-website/modules/components/ScrollToDoc.js
  113. +0 −9 packages/react-router-website/modules/components/SmallScreen.js
  114. +0 −55 packages/react-router-website/modules/components/WebExample.js
  115. +0 −25 packages/react-router-website/modules/docs/Core.js
  116. +0 −89 packages/react-router-website/modules/docs/Native.js
  117. +0 −100 packages/react-router-website/modules/docs/Web.js
  118. +0 −116 packages/react-router-website/modules/examples/Animation.js
  119. +0 −101 packages/react-router-website/modules/examples/Auth.js
  120. +0 −72 packages/react-router-website/modules/examples/Basic.js
  121. +0 −40 packages/react-router-website/modules/examples/CustomLink.js
  122. +0 −47 packages/react-router-website/modules/examples/NoMatch.js
  123. +0 −30 packages/react-router-website/modules/examples/Params.js
  124. +0 −43 packages/react-router-website/modules/examples/Recursive.js
  125. +0 −78 packages/react-router-website/modules/examples/RouteConfig.js
  126. +0 −72 packages/react-router-website/modules/examples/StaticRouter.js
  127. +0 −8 packages/react-router-website/modules/index.js
  128. +0 −6,778 packages/react-router-website/package-lock.json
  129. +0 −54 packages/react-router-website/package.json
  130. +0 −88 packages/react-router-website/webpack.config.js
  131. +0 −177 packages/react-router-website/webpack/markdown-loader.js
  132. +3 −3 packages/react-router/docs/api/MemoryRouter.md
  133. +5 −5 packages/react-router/docs/api/Prompt.md
  134. +37 −15 packages/react-router/docs/api/Redirect.md
  135. +27 −12 packages/react-router/docs/api/Route.md
  136. +3 −3 packages/react-router/docs/api/Router.md
  137. +5 −5 packages/react-router/docs/api/StaticRouter.md
  138. +5 −5 packages/react-router/docs/api/Switch.md
  139. +2 −2 packages/react-router/docs/api/history.md
  140. +1 −1 packages/react-router/docs/api/location.md
  141. +26 −1 packages/react-router/docs/api/match.md
  142. +1 −1 packages/react-router/docs/api/matchPath.md
  143. +3 −3 packages/react-router/docs/api/withRouter.md
  144. +1 −1 packages/react-router/docs/guides/Installation.md
  145. +28 −10 packages/react-router/docs/guides/blocked-updates.md
  146. +43 −20 packages/react-router/docs/guides/migrating.md
  147. +1 −1 packages/react-router/docs/guides/philosophy.md
  148. +2 −2 packages/react-router/docs/guides/testing.md
  149. +3 −7 packages/react-router/modules/.eslintrc
  150. +12 −12 packages/react-router/modules/MemoryRouter.js
  151. +19 −24 packages/react-router/modules/Prompt.js
  152. +47 −31 packages/react-router/modules/Redirect.js
  153. +58 −59 packages/react-router/modules/Route.js
  154. +24 −24 packages/react-router/modules/Router.js
  155. +56 −78 packages/react-router/modules/StaticRouter.js
  156. +35 −25 packages/react-router/modules/Switch.js
  157. +30 −31 packages/react-router/modules/__tests__/MemoryRouter-test.js
  158. +40 −0 packages/react-router/modules/__tests__/Redirect-test.js
  159. +379 −322 packages/react-router/modules/__tests__/Route-test.js
  160. +70 −71 packages/react-router/modules/__tests__/Router-test.js
  161. +211 −162 packages/react-router/modules/__tests__/StaticRouter-test.js
  162. +276 −270 packages/react-router/modules/__tests__/Switch-test.js
  163. +27 −26 packages/react-router/modules/__tests__/SwitchMount-test.js
  164. +68 −0 packages/react-router/modules/__tests__/generatePath-test.js
  165. +62 −61 packages/react-router/modules/__tests__/integration-test.js
  166. +75 −66 packages/react-router/modules/__tests__/matchPath-test.js
  167. +123 −88 packages/react-router/modules/__tests__/withRouter-test.js
  168. +34 −0 packages/react-router/modules/generatePath.js
  169. +10 −9 packages/react-router/modules/index.js
  170. +32 −33 packages/react-router/modules/matchPath.js
  171. +24 −18 packages/react-router/modules/withRouter.js
  172. +5,360 −2,175 packages/react-router/package-lock.json
  173. +31 −22 packages/react-router/package.json
  174. +19 −18 packages/react-router/rollup.config.js
  175. +0 −4 packages/react-router/tools/babel-preset.js
  176. +13 −0 scripts/build.js
  177. +17 −0 scripts/postinstall.js
  178. 0 {packages/react-router-website → website}/.gitignore
  179. 0 {packages/react-router-website → website}/index.html.ejs
  180. 0 {packages/react-router-website → website}/modules/.babelrc
  181. 0 {packages/react-router-website → website}/modules/.eslintrc
  182. +11 −0 website/modules/LoadServiceWorker.js
  183. +4 −5 {packages/react-router-website → website}/modules/ReactRouterDOMShim.js
  184. +5 −0 website/modules/Theme.js
  185. +7 −3 {packages/react-router-website → website}/modules/animated/Animated.js
  186. +14 −14 {packages/react-router-website → website}/modules/animated/AnimatedAddition.js
  187. +16 −13 {packages/react-router-website → website}/modules/animated/AnimatedInterpolation.js
  188. +12 −10 {packages/react-router-website → website}/modules/animated/AnimatedModulo.js
  189. +14 −14 {packages/react-router-website → website}/modules/animated/AnimatedMultiplication.js
  190. +5 −8 {packages/react-router-website → website}/modules/animated/AnimatedProps.js
  191. +6 −6 {packages/react-router-website → website}/modules/animated/AnimatedStyle.js
  192. +3 −3 {packages/react-router-website → website}/modules/animated/AnimatedTemplate.js
  193. +12 −9 {packages/react-router-website → website}/modules/animated/AnimatedTracking.js
  194. +3 −3 {packages/react-router-website → website}/modules/animated/AnimatedTransform.js
  195. +17 −17 {packages/react-router-website → website}/modules/animated/AnimatedValue.js
  196. +26 −28 {packages/react-router-website → website}/modules/animated/AnimatedValueXY.js
  197. +3 −3 {packages/react-router-website → website}/modules/animated/AnimatedWithChildren.js
  198. +6 −6 {packages/react-router-website → website}/modules/animated/Animation.js
  199. +26 −20 {packages/react-router-website → website}/modules/animated/DecayAnimation.js
  200. +17 −25 {packages/react-router-website → website}/modules/animated/Easing.js
  201. +55 −49 {packages/react-router-website → website}/modules/animated/Interpolation.js
  202. +1 −1 {packages/react-router-website → website}/modules/animated/SetPolyfill.js
  203. +55 −40 {packages/react-router-website → website}/modules/animated/SpringAnimation.js
  204. +14 −12 {packages/react-router-website → website}/modules/animated/SpringConfig.js
  205. +25 −22 {packages/react-router-website → website}/modules/animated/TimingAnimation.js
  206. +135 −0 website/modules/animated/bezier.js
  207. +17 −17 {packages/react-router-website → website}/modules/animated/createAnimatedComponent.js
  208. +1 −1 {packages/react-router-website → website}/modules/animated/guid.js
  209. +150 −135 {packages/react-router-website → website}/modules/animated/index.js
  210. +2 −2 {packages/react-router-website → website}/modules/animated/injectable/ApplyAnimatedValues.js
  211. +2 −2 {packages/react-router-website → website}/modules/animated/injectable/CancelAnimationFrame.js
  212. +2 −2 {packages/react-router-website → website}/modules/animated/injectable/FlattenStyle.js
  213. +3 −3 {packages/react-router-website → website}/modules/animated/injectable/InteractionManager.js
  214. +2 −2 {packages/react-router-website → website}/modules/animated/injectable/RequestAnimationFrame.js
  215. +2 −2 {packages/react-router-website → website}/modules/animated/isAnimated.js
  216. +14 −12 {packages/react-router-website → website}/modules/animated/targets/react-dom.js
  217. +4 −4 {packages/react-router-website → website}/modules/animated/targets/react-native.js
  218. +1 −1 {packages/react-router-website → website}/modules/base.css
  219. +37 −0 website/modules/components/API.js
  220. +48 −0 website/modules/components/APISmall.js
  221. +28 −0 website/modules/components/App.js
  222. +32 −0 website/modules/components/Bundle.js
  223. +41 −0 website/modules/components/DelegateMarkdownLinks.js
  224. +74 −0 website/modules/components/Environment.js
  225. +82 −0 website/modules/components/EnvironmentHeader.js
  226. +71 −77 {packages/react-router-website → website}/modules/components/EnvironmentLarge.js
  227. +207 −208 {packages/react-router-website → website}/modules/components/EnvironmentSmall.js
  228. +37 −0 website/modules/components/Example.js
  229. +165 −0 website/modules/components/FakeBrowser.js
  230. +20 −21 {packages/react-router-website → website}/modules/components/Footer.js
  231. +42 −0 website/modules/components/Guide.js
  232. +142 −0 website/modules/components/Home/Header.js
  233. +7 −11 {packages/react-router-website → website}/modules/components/Home/Video.js
  234. +13 −0 website/modules/components/Home/index.js
  235. +4 −4 {packages/react-router-website → website}/modules/components/Loading.js
  236. +24 −0 website/modules/components/Logo.js
  237. +132 −0 website/modules/components/MailingListSignup.js
  238. +6 −6 {packages/react-router-website → website}/modules/components/MarkdownViewer.js
  239. +63 −0 website/modules/components/NativeExample.js
  240. +48 −50 {packages/react-router-website → website}/modules/components/PanGesture.js
  241. +116 −0 website/modules/components/ScrollToDoc.js
  242. +9 −0 website/modules/components/SmallScreen.js
  243. +7 −7 {packages/react-router-website → website}/modules/components/SourceViewer.js
  244. +61 −0 website/modules/components/WebExample.js
  245. +25 −0 website/modules/docs/Core.js
  246. +89 −0 website/modules/docs/Native.js
  247. +114 −0 website/modules/docs/Web.js
  248. +22 −19 {packages/react-router-website → website}/modules/examples/Ambiguous.js
  249. +143 −0 website/modules/examples/Animation.js
  250. +114 −0 website/modules/examples/Auth.js
  251. +70 −0 website/modules/examples/Basic.js
  252. +41 −0 website/modules/examples/CustomLink.js
  253. +76 −69 {packages/react-router-website → website}/modules/examples/ModalGallery.js
  254. +58 −0 website/modules/examples/NoMatch.js
  255. +51 −0 website/modules/examples/Params.js
  256. +27 −25 {packages/react-router-website → website}/modules/examples/PreventingTransitions.js
  257. +37 −0 website/modules/examples/Recursive.js
  258. +85 −0 website/modules/examples/RouteConfig.js
  259. +30 −23 {packages/react-router-website → website}/modules/examples/Sidebar.js
  260. +65 −0 website/modules/examples/StaticRouter.js
  261. +8 −0 website/modules/index.js
  262. BIN {packages/react-router-website → website}/modules/logo.png
  263. +19 −0 website/modules/utils/subscribeToMailingList.js
  264. +10,422 −0 website/package-lock.json
  265. +56 −0 website/package.json
  266. BIN {packages/react-router-website → website}/static/android-chrome-144x144.png
  267. BIN {packages/react-router-website → website}/static/apple-touch-icon.png
  268. 0 {packages/react-router-website → website}/static/browserconfig.xml
  269. BIN {packages/react-router-website → website}/static/favicon-16x16.png
  270. BIN {packages/react-router-website → website}/static/favicon-32x32.png
  271. BIN {packages/react-router-website → website}/static/favicon.ico
  272. 0 {packages/react-router-website → website}/static/manifest.json
  273. BIN {packages/react-router-website → website}/static/mstile-150x150.png
  274. BIN {packages/react-router-website → website}/static/react-square.png
  275. 0 {packages/react-router-website → website}/static/safari-pinned-tab.svg
  276. +146 −0 website/webpack.config.js
  277. +172 −0 website/webpack/markdown-loader.js
  278. +52 −0 website/webpack/prismjs-loader.js
25 changes: 25 additions & 0 deletions .github/lock.yml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
# Configuration for lock-threads - https://github.com/dessant/lock-threads

# Number of days of inactivity before a closed issue or pull request is locked
daysUntilLock: 60

# Issues and pull requests with these labels will not be locked. Set to `[]` to disable
exemptLabels: []

# Label to add before locking, such as `outdated`. Set to `false` to disable
lockLabel: false

# Comment to post before locking. Set to `false` to disable
lockComment: false

# Limit to only `issues` or `pulls`
# only: issues

# Optionally, specify configuration settings just for `issues` or `pulls`
# issues:
# exemptLabels:
# - help-wanted
# lockLabel: outdated

# pulls:
# daysUntilLock: 30
2 changes: 2 additions & 0 deletions .prettierignore
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
package-lock.json
package.json
18 changes: 9 additions & 9 deletions .travis.yml
View file
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
sudo: false
language: node_js
node_js:
- "node"
- "9"
before_script:
- npm run build
cache:
directories:
- packages/react-router/node_modules
- packages/react-router-dom/node_modules
- packages/react-router-native/node_modules
- packages/react-router-config/node_modules
- packages/react-router-redux/node_modules
- packages/react-router-website/node_modules
- packages/react-router/node_modules
- packages/react-router-dom/node_modules
- packages/react-router-native/node_modules
- packages/react-router-config/node_modules
- packages/react-router-redux/node_modules
- website/node_modules
branches:
only:
- master
- next
- master
- next
Empty file removed .watchmanconfig
View file
Empty file.
Loading