Skip to content

Upgrade dependencies to react 15 #89

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.

Sign up for GitHub

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 3 commits into from
Apr 22, 2016
Merged

Upgrade dependencies to react 15 #89

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
de010cf
Updating package.json to react 15
Apr 16, 2016
593d268
Updating readME
Apr 16, 2016
8fbaa9c
updating examples and bower
ThariqS Apr 19, 2016
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
4 changes: 2 additions & 2 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ In order to use ReactFire in your project, you need to include the following fil

```html
<!-- React -->
<script src="https://fb.me/react-0.14.7.min.js"></script>
<script src="https://fb.me/react-dom-0.14.7.min.js"></script>
<script src="https://fb.me/react-15.0.1.min.js"></script>
<script src="https://fb.me/react-dom-15.0.1.min.js"></script>

<!-- Firebase -->
<script src="https://cdn.firebase.com/js/client/2.4.0/firebase.js"></script>
Expand Down
2 changes: 1 addition & 1 deletion bower.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
"changelog.txt"
],
"dependencies": {
"react": "0.13.x || 0.14.x",
"react": "0.13.x || 0.14.x || 15.x.x",
"firebase": "2.x.x"
}
}
4 changes: 2 additions & 2 deletions examples/commentsBox/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
<title>Hello React</title>

<!-- React -->
<script src="https://fb.me/react-0.14.7.min.js"></script>
<script src="https://fb.me/react-dom-0.14.7.min.js"></script>
<script src="https://fb.me/react-15.0.1.min.js"></script>
<script src="https://fb.me/react-dom-15.0.1.min.js"></script>

<!-- Firebase -->
<script src="https://cdn.firebase.com/js/client/2.4.0/firebase.js"></script>
Expand Down
6 changes: 3 additions & 3 deletions examples/todoApp/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
<title>ReactFire Todo App Demo</title>

<!-- React -->
<script src="https://fb.me/react-0.14.7.min.js"></script>
<script src="https://fb.me/react-dom-0.14.7.min.js"></script>

<script src="https://fb.me/react-15.0.1.min.js"></script>
<script src="https://fb.me/react-dom-15.0.1.min.js"></script>
<!-- Firebase -->
<script src="https://cdn.firebase.com/js/client/2.4.0/firebase.js"></script>

Expand Down
8 changes: 4 additions & 4 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
],
"dependencies": {},
"peerDependencies": {
"react": "0.13.x || 0.14.x",
"react": "0.13.x || 0.14.x || 15.x.x",
"firebase": "2.x.x"
},
"devDependencies": {
Expand All @@ -43,9 +43,9 @@
"gulp-mocha": "^2.1.2",
"gulp-uglify": "^1.2.0",
"jsdom": "3.x.x",
"react-addons-test-utils": "0.14.x",
"react": "0.14.x",
"react-dom": "0.14.x",
"react-addons-test-utils": "15.x.x",
"react": "15.x.x",
"react-dom": "15.x.x",
"run-sequence": "^1.1.1",
"sinon": "^1.15.4",
"sinon-chai": "^2.8.0"
Expand Down