Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit f3f9576

Browse files
Merge pull request #689 from reactjs/2.0-dev
react-rails 2.0
2 parents 1647845 + d40a893 commit f3f9576

File tree

137 files changed

+9273
-886
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

137 files changed

+9273
-886
lines changed

‎.gitignore‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,10 @@
22
Gemfile.lock
33
*.log
44
test/dummy/tmp
5+
test/dummy/public/packs
56
gemfiles/*.lock
67
*.swp
78
/vendor/react
8-
react-builds/node_modules
9+
**/node_modules
910
react-builds/build
1011
coverage/

‎.travis.yml‎

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,25 @@
11
language: ruby
22
sudo: required
33
dist: trusty
4-
cache: bundler
4+
cache:
5+
bundler: true
6+
yarn: true
57
rvm:
68
- 2.3.0
79
- 2.1
810
- jruby-9.0.1.0
911

1012
gemfile:
13+
# These have webpacker:
14+
- gemfiles/rails_4.2_sprockets_4.gemfile
15+
- gemfiles/rails_5_no_sprockets_webpacker.gemfile
16+
# These don't have webpacker:
1117
- gemfiles/rails_3.2.gemfile
1218
- gemfiles/rails_4.0.5.gemfile
1319
- gemfiles/rails_4.0_with_therubyracer.gemfile
1420
- gemfiles/rails_4.1.gemfile
1521
- gemfiles/rails_4.2_sprockets_2.gemfile
1622
- gemfiles/rails_4.2_sprockets_3.gemfile
17-
- gemfiles/rails_4.2_sprockets_4.gemfile
18-
- gemfiles/rails_5.gemfile
1923
- gemfiles/rails_5_no_sprockets.gemfile
2024
- gemfiles/rails_5_sprockets_4.gemfile
2125

@@ -35,7 +39,7 @@ matrix:
3539
- rvm: 2.1
3640
gemfile: gemfiles/rails_4.2_sprockets_4.gemfile
3741
- rvm: 2.1
38-
gemfile: gemfiles/rails_5.gemfile
42+
gemfile: gemfiles/rails_5_no_sprockets_webpacker.gemfile
3943
- rvm: 2.1
4044
gemfile: gemfiles/rails_5_no_sprockets.gemfile
4145
- rvm: 2.1
@@ -49,14 +53,20 @@ matrix:
4953
- rvm: jruby-9.0.1.0
5054
gemfile: gemfiles/rails_4.2_sprockets_2.gemfile
5155
- rvm: jruby-9.0.1.0
52-
gemfile: gemfiles/rails_5_mini_racer.gemfile
56+
gemfile: gemfiles/rails_5_no_sprockets_webpacker.gemfile
5357

5458
allow_failures:
5559
- rvm: jruby-9.0.1.0
5660

5761
before_install:
62+
- nvm install 7.8.0 && nvm use 7.8.0
5863
- mkdir travis-phantomjs
5964
- wget https://rmosolgo.github.io/assets/phantomjs-2.1.1-linux-x86_64.tar.bz2 -O $PWD/travis-phantomjs/phantomjs-2.1.1-linux-x86_64.tar.bz2
6065
- tar -xvf $PWD/travis-phantomjs/phantomjs-2.1.1-linux-x86_64.tar.bz2 -C $PWD/travis-phantomjs
6166
- export PATH=$PWD/travis-phantomjs/phantomjs-2.1.1-linux-x86_64/bin:$PATH
6267
- phantomjs --version
68+
# Repo for Yarn
69+
- sudo apt-key adv --fetch-keys http://dl.yarnpkg.com/debian/pubkey.gpg
70+
- echo "deb http://dl.yarnpkg.com/debian/ stable main" | sudo tee /etc/apt/sources.list.d/yarn.list
71+
- sudo apt-get update -qq
72+
- sudo apt-get install -y -qq yarn

‎Appraisals‎

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,14 +43,25 @@ appraise "rails-4.2-sprockets_4" do
4343
gem 'rails', '~> 4.2.1'
4444
gem "sprockets", "~> 4.0.x"
4545
gem "turbolinks", "~> 2.5.0"
46+
gem "webpacker", github: "rails/webpacker"
47+
# This ExecJS backend provides stateful context
48+
# which the default nodejs backend does not
49+
gem "mini_racer"
4650
end
4751

48-
appraise "rails-5" do
52+
appraise "rails-5_no_sprockets_webpacker" do
4953
gem 'rails', '~> 5.0.0'
50-
gem "turbolinks", "~> 5.0.0"
54+
gem "webpacker", github: "rails/webpacker"
55+
# This ExecJS backend provides stateful context
56+
# which the default nodejs backend does not
57+
gem "therubyracer"
5158
end
5259

5360
appraise "rails-5-no_sprockets" do
61+
# Appraisal adds `turbolinks` to this gemfile because it is
62+
# present in `./Gemfile`.
63+
# But it causes this gemfile to break, so it must be removed
64+
# from `./gemfiles/rails_5_no_sprockets.gemfile` manually.
5465
gem 'rails', '~> 5.0.0'
5566
end
5667

‎CHANGELOG.md‎

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,35 @@
88

99
#### Bug Fixes
1010

11+
## 2.0.0 (April 13, 2017)
12+
13+
#### Breaking Changes
14+
15+
- Server rendering loads `server_rendering.js` by default #471 . Upgrade by adding a new file which requires the previous defaults:
16+
17+
```js
18+
// app/assets/javascripts/server_rendering.js
19+
// = require react-server
20+
// = require components
21+
```
22+
23+
24+
#### New Features
25+
26+
- Webpacker support:
27+
- `react_component` can find components via `require.context` + `ReactRailsUJS.useContext` #678
28+
- Server rendering detects Webpacker and uses packs #683, #687
29+
- `ReactRailsUJS` is available from `npm` with `yarn add react_ujs` or `npm install react_ujs` #678
30+
- `per_request_react_rails_prerenderer` Allows you to check out a renderer for the _whole request_ instead of once-per-`react_component` #559
31+
32+
#### Bug Fixes
33+
34+
- Improved watching of server-rendering JS files #687
35+
- Fix console replay:
36+
- Put the `<script>` tag outside the React.js container to avoid React warnings #691
37+
- Clear console history between renders #692
38+
- Use better Turbolinks events #690
39+
1140
## 1.11.0 (April 4, 2017)
1241

1342
#### New Features

‎Gemfile‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
11
source 'http://rubygems.org'
22

33
gemspec
4+
# This is an optional dev-dependency, required whenever sprockets is required
5+
gem "turbolinks"

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /