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: shakacode/react_on_rails
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 6.2.1
Choose a base ref
...
head repository: shakacode/react_on_rails
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 6.3.0
Choose a head ref
  • 10 commits
  • 54 files changed
  • 6 contributors

Commits on Nov 23, 2016

  1. Update README.md

    justin808 authored Nov 23, 2016
    Configuration menu
    Copy the full SHA
    3cde086 View commit details
    Browse the repository at this point in the history

Commits on Nov 27, 2016

  1. Update README.md

    justin808 authored Nov 27, 2016
    Configuration menu
    Copy the full SHA
    03c5e96 View commit details
    Browse the repository at this point in the history

Commits on Nov 30, 2016

  1. Remove section on lib/tasks/asset.rake (#627)

    Addresses Issue #616.
    
    React on Rails has been updated so this is no longer needed.
    dijonkitchen authored and justin808 committed Nov 30, 2016
    Configuration menu
    Copy the full SHA
    17512b1 View commit details
    Browse the repository at this point in the history
  2. Update Basic Generator & Linters (#624)

    * Update basic generator so that the basic example is simpler
    * All files registered for react on rails go in the registration.js file.
    Judahmeek authored and justin808 committed Nov 30, 2016
    Configuration menu
    Copy the full SHA
    48d1747 View commit details
    Browse the repository at this point in the history
  3. add engine doc (#614)

    Judahmeek authored and justin808 committed Nov 30, 2016
    Configuration menu
    Copy the full SHA
    ae9785b View commit details
    Browse the repository at this point in the history
  4. Don't assume ActionMailer is available (#608)

    If the Rails app that uses this gem doesn't include the
    ActionMailer railtie, the gem raises this error:
    
    `uninitialized constant ReactOnRailsHelper::ActionMailer`
    
    This change introduces a check that the ActionMailer
    constant is defined before setting the 'inMailer' option.
    
    I'm not quite sure how to test this, so if anyone has
    ideas, that would be helpful.
    tuzz authored and justin808 committed Nov 30, 2016
    Configuration menu
    Copy the full SHA
    2a227d4 View commit details
    Browse the repository at this point in the history

Commits on Dec 1, 2016

  1. Modify register API to accept renderer functions (#581)

    Made the following changes to the node package:
    
    * ComponentRegistry.js: Modified register to detect generator functions
      with three arguments. Set the isRenderer key to true for these
      functions.
    * clientStartup.js: Added logic to delegate to renderer functions.
    * createReactElement.js: Now accepts an object instead of a component
      name.
    * serverRenderReactComponent.js: Throws an error if attempting to
      render a renderer function.
    * ReactOnRails.js: Change render function to call createReactElement
      with the component object.
    
    Doc changes:
    
    * README.md: Added section about renderer function under the section
      on generator functions. Moved the section on generator functions
      from the 'ReactOnRails View Helpers API' section to the 'Globally
      Exposing Your React Components' section.
    * Added a file code-splitting.md that describes how to use renderer
      functions to do code splitting with server rendering.
    
    Tests:
    
    * ComponentRegistry.test.js: Modified existing test cases to expect
      the isRenderer key to be false. Added a few test cases related to
      renderer functions.
    * serverRenderReactComponent.test.js: Show that an error gets thrown
      if trying to server render with a renderer function.
    * spec/dummy: Added two examples using rendering functions, one of
      which implements code splitting. Added three test to
      integration_spec.rb.
    
    Resolves: #477
    jtibbertsma authored and justin808 committed Dec 1, 2016
    Configuration menu
    Copy the full SHA
    62fb5d6 View commit details
    Browse the repository at this point in the history
  2. Slight improvement to the 'no hydrated stores' error (#605)

    * Slight improvement to the 'no hydrated stores' error
    This should make it more clear that rendering
    `redux_store_hydration_data` is required.
    This should more cleanly differentiate the two cases
    * Change hydrated stores error to be a list of actions
    cookiefission authored and justin808 committed Dec 1, 2016
    Configuration menu
    Copy the full SHA
    843c43d View commit details
    Browse the repository at this point in the history
  3. Update CHANGELOG.md

    justin808 authored Dec 1, 2016
    Configuration menu
    Copy the full SHA
    699fd59 View commit details
    Browse the repository at this point in the history
  4. Release 6.3.0

    justin808 committed Dec 1, 2016
    Configuration menu
    Copy the full SHA
    7ca22d3 View commit details
    Browse the repository at this point in the history
Loading