Skip to content

Commit 8f6ec52

Browse files
committed
Merge pull request #2 from hughevans/master
Bump React to 0.11.1
2 parents 652205d + 11bbf06 commit 8f6ec52

File tree

5 files changed

+29
-6
lines changed

5 files changed

+29
-6
lines changed

Gemfile.lock

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
PATH
22
remote: .
33
specs:
4-
middleman-react (0.10.0)
4+
middleman-react (0.11.1)
55
execjs
66
middleman-core (>= 3.0)
7-
react-source (= 0.10.0)
7+
react-source (~> 0.11.1)
88

99
GEM
1010
remote: https://rubygems.org/
@@ -103,7 +103,7 @@ GEM
103103
ffi (>= 0.5.0)
104104
rdoc (3.12.2)
105105
json (~> 1.4)
106-
react-source (0.10.0)
106+
react-source (0.11.1)
107107
rspec (2.14.1)
108108
rspec-core (~> 2.14.0)
109109
rspec-expectations (~> 2.14.0)

README.md

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,29 @@ Inspired (and pretty much a clone of really) the [react-rails] gem for Middleman
99
1. `gem install middleman-react`
1010
2. `activate :react` in `config.rb`
1111

12+
13+
#### Sprockets loading react-source
14+
15+
In your Middleman `config.rb` add the following:
16+
17+
``` ruby
18+
after_configuration do
19+
sprockets.append_path File.dirname(::React::Source.bundled_path_for('react.js'))
20+
end
21+
```
22+
23+
Now you can Sprockets include React:
24+
25+
```
26+
//= require react
27+
```
28+
29+
Or with addons:
30+
31+
```
32+
//= require react-with-addons
33+
```
34+
1235
#### Developing / Contributing
1336
1. Fork it!
1437
2. Get set up: `./script/bootstrap`

lib/middleman-react/version.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,6 @@ module Middleman
44
# Gem packaging constants
55
module React
66
PACKAGE = 'middleman-react'
7-
VERSION = '0.10.0'
7+
VERSION = '0.11.1'
88
end
99
end

middleman-react.gemspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ Gem::Specification.new do |gem|
1818

1919
gem.add_dependency "middleman-core", [">= 3.0"]
2020
gem.add_dependency "execjs"
21-
gem.add_dependency "react-source", "0.10.0"
21+
gem.add_dependency "react-source", "~> 0.11.1"
2222

2323
gem.add_development_dependency "aruba"
2424
gem.add_development_dependency "cane"

spec/features/coffeescript.feature

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ Feature: Transforming JSX into Javascript when it is written in Coffeescript
1717
this.app.components.test = React.createClass({displayName: 'test',
1818
render: function() {
1919
return React.DOM.div(null,
20-
TestComponent( {data:this.props.someData} )
20+
TestComponent({data: this.props.someData})
2121
);
2222
}
2323
});

0 commit comments

Comments
 (0)