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: remarkablemark/universal-react-tutorial
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: remarkablemark/universal-react-tutorial
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: upgrade-react-router
Choose a head ref
Checking mergeability… Don’t worry, you can still create the pull request.
  • 3 commits
  • 7 files changed
  • 1 contributor

Commits on Mar 15, 2017

  1. Upgrade to react-router@4 and refactor app

    Refactor server rendering with `react-router` <StaticRouter>
    and update client to use `react-router-dom` <BrowserRouter> and
    other components.
    
    Server rendering documentation:
    https://reacttraining.com/react-router/web/guides/server-rendering
    remarkablemark committed Mar 15, 2017
    Configuration menu
    Copy the full SHA
    7d2c143 View commit details
    Browse the repository at this point in the history
  2. Have server handle redirects and render <NotFound> on 404

    Use <StaticRouter> context object to deal with server redirect
    or 404 response.
    
    Create new catch-all (404) route that renders <NotFound>.
    remarkablemark committed Mar 15, 2017
    Configuration menu
    Copy the full SHA
    c75eca8 View commit details
    Browse the repository at this point in the history

Commits on Apr 18, 2017

  1. Save exact versions of dependencies in package.json

    react-router@4.1 causes the app to break with the error:
    ```
    Uncaught Error: Calling PropTypes validators directly is not
    supported by the 'prop-types' package.
    Use 'PropTypes.checkPropTypes()' to call them.
    Read more at http://fb.me/use-check-prop-types
    ```
    remarkablemark committed Apr 18, 2017
    Configuration menu
    Copy the full SHA
    da62b5a View commit details
    Browse the repository at this point in the history
Loading