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: v1.2.2
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: 2.0.0
Choose a head ref
  • 16 commits
  • 301 files changed
  • 2 contributors

Commits on Jan 8, 2016

  1. Update CHANGELOG.md

    justin808 committed Jan 8, 2016
    Configuration menu
    Copy the full SHA
    c26b222 View commit details
    Browse the repository at this point in the history
  2. Update package.json.tt

    justin808 committed Jan 8, 2016
    Configuration menu
    Copy the full SHA
    0ba892a View commit details
    Browse the repository at this point in the history
  3. Merge pull request #188 from shakacode/justin808-patch-1

    Update package.json.tt remove double lodash
    justin808 committed Jan 8, 2016
    Configuration menu
    Copy the full SHA
    02e4a7d View commit details
    Browse the repository at this point in the history
  4. Bump to 1.2.2

    justin808 committed Jan 8, 2016
    Configuration menu
    Copy the full SHA
    025c6ee View commit details
    Browse the repository at this point in the history
  5. Updated Gemfile.lock

    justin808 committed Jan 8, 2016
    Configuration menu
    Copy the full SHA
    c583707 View commit details
    Browse the repository at this point in the history

Commits on Jan 11, 2016

  1. Fix #189 Generator Error for application.scss

    Removed the File.exists? check for application.scss
    because it gets created if it doesn’t exist in
    the method before it.
    aaronvb committed Jan 11, 2016
    Configuration menu
    Copy the full SHA
    a8b4fcb View commit details
    Browse the repository at this point in the history

Commits on Jan 12, 2016

  1. Merge pull request #192 from aaronvb/bootstrap_generator_application_…

    …scss
    
    Fix #189 Generator Error for application.scss
    justin808 committed Jan 12, 2016
    Configuration menu
    Copy the full SHA
    18b1eb2 View commit details
    Browse the repository at this point in the history

Commits on Jan 14, 2016

  1. ReactOnRails v2.0

    - Move JavaScript part of react_on_rails to npm package
      'react-on-rails'.
    - Converted JavaScript code to ES6! with tests!
    - No global namespace pollution. ReactOnRails is the only global added.
    - New API. Instead of placing React components on the global namespace,
      you instead call ReactOnRails.register, passing an object where keys
      are the names of your components.
      ```
      import ReactOnRails from 'react-on-rails';
      ReactOnRails.registerComponent({name: component});
      ```
      Best done with Object destructing
      ```
      import ReactOnRails from 'react-on-rails';
      ReactOnRails.registerComponent(
        {
          Component1,
          Component2
        }
      );
      ```
      Previously, you used
      ```
      window.Component1 = Component1;
      window.Component2 = Component2;
      ```
      This would pollute the global namespace. See details in the README.md
      for more information.
    - Your jade template for the WebpackDevServer setup should use the new
      API:
      `ReactOnRails.render(componentName, props, domNodeId);`
      such as:
      `ReactOnRails.render("HelloWorldApp", {name: "Stranger"}, 'app');`
    - All npm dependency libraries updated. Most notable is going to Babel
      6.
    - Dropped support for react 0.13.
    - JS Linter uses ShakaCode JavaScript style:
      https://github.com/shakacode/style-guide-javascript
    - Generators account these differences.
    
    Other fixes and changes
    * Auto detection of generator function!
    * Previously, we could not have react installed as a devDependency at the
      top level with react-on-rails, or else we get an obscure 'react is
      included multiple times' error.
    
      Fix is to add this to the webpack configs:
    
        resolve: {
          root: [path.join(__dirname, 'app')],
          extensions: ['', '.js', '.jsx'],
          fallback: [path.join(__dirname, 'node_modules')],
          alias: {
            react: path.resolve('./node_modules/react'),
            "react-dom": path.resolve('./node_modules/react-dom'),
          },
        },
    
      That ensures that react is only loaded from one place.
    
      Also cleaned up linting and test scripts so that it's easier to run all
      the tests.
    * Finish up the changes to the generators
    * Doc updates
    * Changed domId to domNodeId (thanks Rob and Alex)
    * Fixed generators to use new API of "registration" from "globals"
    * Fixed tests for generators
    * Updated doc to indicate directories to ignore
    * Change example apps to use Poltergeist for integration tests
    * Move coveralls push to Rakefile so we don't fail after running tests locally and short circuit the linters
    * Update technique for generatorFunction
      See discussion on
      https://discuss.reactjs.org/t/how-to-determine-if-js-object-is-react-component/2825/2
    * Change styling of gen app
    * fix issue with ruby-lint.yml
    * Fixed display of warning messages and stop app
    * add option to override stopping when you get warnings
    * Made the dumb component dumber, better formatting
    * Allows removal of bootstrap and better styling
    * Add resolveLoader to generated example apps' webpack.client.base.config.js
    * Shakacode linter style, switch to non-docker lint
    * Using eslint-config-shakacode
    * Created tutorial
    * Create rails3.md
    * Add migration steps to changelog.MD
    * VersionChecker only warns if major versions are different
    justin808 committed Jan 14, 2016
    Configuration menu
    Copy the full SHA
    f7ef290 View commit details
    Browse the repository at this point in the history
  2. Release 2.0.0-rc.4

    justin808 committed Jan 14, 2016
    Configuration menu
    Copy the full SHA
    ae2540d View commit details
    Browse the repository at this point in the history
  3. Bump to 2.0.0.rc.4

    justin808 committed Jan 14, 2016
    Configuration menu
    Copy the full SHA
    0a0b558 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    6d8cef5 View commit details
    Browse the repository at this point in the history
  5. Update releasing.md

    justin808 committed Jan 14, 2016
    Configuration menu
    Copy the full SHA
    3cbea9d View commit details
    Browse the repository at this point in the history
  6. Merge pull request #148 from shakacode/npm-react-on-rails-js

    WIP -- conversion to ES6, npm for react_on_rails
    justin808 committed Jan 14, 2016
    Configuration menu
    Copy the full SHA
    51f77e0 View commit details
    Browse the repository at this point in the history
  7. Update README.md

    justin808 committed Jan 14, 2016
    Configuration menu
    Copy the full SHA
    b3e69da View commit details
    Browse the repository at this point in the history
  8. Bump to 2.0.0

    justin808 committed Jan 14, 2016
    Configuration menu
    Copy the full SHA
    04c5c02 View commit details
    Browse the repository at this point in the history
  9. Release 2.0.0

    justin808 committed Jan 14, 2016
    Configuration menu
    Copy the full SHA
    9a827aa View commit details
    Browse the repository at this point in the history
Loading