Skip to content

Bump React to 0.11.1 #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Aug 14, 2014
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
PATH
remote: .
specs:
middleman-react (0.10.0)
middleman-react (0.11.1)
execjs
middleman-core (>= 3.0)
react-source (= 0.10.0)
react-source (~> 0.11.1)

GEM
remote: https://rubygems.org/
Expand Down Expand Up @@ -103,7 +103,7 @@ GEM
ffi (>= 0.5.0)
rdoc (3.12.2)
json (~> 1.4)
react-source (0.10.0)
react-source (0.11.1)
rspec (2.14.1)
rspec-core (~> 2.14.0)
rspec-expectations (~> 2.14.0)
Expand Down
23 changes: 23 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,29 @@ Inspired (and pretty much a clone of really) the [react-rails] gem for Middleman
1. `gem install middleman-react`
2. `activate :react` in `config.rb`


#### Sprockets loading react-source

In your Middleman `config.rb` add the following:

``` ruby
after_configuration do
sprockets.append_path File.dirname(::React::Source.bundled_path_for('react.js'))
end
```

Now you can Sprockets include React:

```
//= require react
```

Or with addons:

```
//= require react-with-addons
```

#### Developing / Contributing
1. Fork it!
2. Get set up: `./script/bootstrap`
Expand Down
2 changes: 1 addition & 1 deletion lib/middleman-react/version.rb
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@ module Middleman
# Gem packaging constants
module React
PACKAGE = 'middleman-react'
VERSION = '0.10.0'
VERSION = '0.11.1'
end
end
2 changes: 1 addition & 1 deletion middleman-react.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ Gem::Specification.new do |gem|

gem.add_dependency "middleman-core", [">= 3.0"]
gem.add_dependency "execjs"
gem.add_dependency "react-source", "0.10.0"
gem.add_dependency "react-source", "~> 0.11.1"

gem.add_development_dependency "aruba"
gem.add_development_dependency "cane"
Expand Down
2 changes: 1 addition & 1 deletion spec/features/coffeescript.feature
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ Feature: Transforming JSX into Javascript when it is written in Coffeescript
this.app.components.test = React.createClass({displayName: 'test',
render: function() {
return React.DOM.div(null,
TestComponent( {data:this.props.someData} )
TestComponent({data: this.props.someData})
);
}
});
Expand Down