Skip to content

Commit

Permalink
update React to v15.0.0-rc.1
Browse files Browse the repository at this point in the history
  • Loading branch information
minwe committed Mar 10, 2016
1 parent 272772a commit 9a8bbac
Show file tree
Hide file tree
Showing 3 changed files with 20 additions and 20 deletions.
1 change: 0 additions & 1 deletion kitchen-sink/app.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import React from 'react';
import ReactDOM from 'react-dom';
import CSSTransitionGroup from 'react-addons-css-transition-group';
import {
Router,
Route,
Expand Down
37 changes: 19 additions & 18 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
"main": "lib/index.js",
"scripts": {
"start": "gulp",
"docs": "NODE_ENV=production gulp",
"build": "env NODE_ENV=production gulp build",
"test": "echo \"Error: no test specified\" && exit 1",
"eslint": "./node_modules/.bin/eslint ./src/js/",
Expand All @@ -30,51 +31,51 @@
},
"homepage": "https://github.com/amazeui/amazeui-touch#readme",
"devDependencies": {
"babel-core": "^6.5.2",
"babel-core": "^6.7.0",
"babel-eslint": "^5.0.0",
"babel-loader": "^6.2.3",
"babel-loader": "^6.2.4",
"babel-plugin-transform-object-assign": "^6.5.0",
"babel-plugin-transform-object-rest-spread": "^6.5.0",
"babel-plugin-transform-react-jsx": "^6.5.2",
"babel-preset-es2015": "^6.5.0",
"babel-preset-es2015": "^6.6.0",
"babel-preset-stage-0": "^6.5.0",
"babelify": "^7.2.0",
"brfs": "^1.4.3",
"browser-sync": "^2.11.1",
"browserify": "^13.0.0",
"clipboard": "^1.5.8",
"clipboard": "^1.5.9",
"del": "^2.2.0",
"eslint": "^2.2.0",
"eslint": "^2.3.0",
"eslint-config-airbnb": "^6.0.2",
"eslint-plugin-react": "^4.1.0",
"gulp": "^3.9.0",
"gulp-autoprefixer": "^3.0.2",
"gulp-babel": "^6.1.0",
"gulp-csso": "^1.0.0",
"eslint-plugin-react": "^4.2.1",
"gulp": "^3.9.1",
"gulp-autoprefixer": "^3.1.0",
"gulp-babel": "^6.1.2",
"gulp-csso": "^1.1.0",
"gulp-header": "^1.7.1",
"gulp-if": "^2.0.0",
"gulp-load-plugins": "^1.1.0",
"gulp-rename": "^1.2.2",
"gulp-replace": "^0.5.4",
"gulp-sass": "^2.1.0",
"gulp-sass": "^2.2.0",
"gulp-size": "^2.0.0",
"gulp-uglify": "^1.4.1",
"gulp-util": "^3.0.6",
"gulp-uglify": "^1.5.3",
"gulp-util": "^3.0.7",
"marked": "^0.3.5",
"markedify": "0.0.2",
"merge-stream": "^1.0.0",
"react-router": "^2.0.0",
"run-sequence": "^1.1.4",
"react-router": "^2.0.1",
"run-sequence": "^1.1.5",
"vinyl-buffer": "^1.0.0",
"vinyl-source-stream": "^1.1.0",
"watchify": "^3.7.0",
"webpack-stream": "^3.1.0"
},
"dependencies": {
"classnames": "^2.2.3",
"react": "^0.14.7",
"react-addons-css-transition-group": "^0.14.7",
"react-dom": "^0.14.7"
"react": "^15.0.0-rc.1",
"react-addons-css-transition-group": "^15.0.0-rc.1",
"react-dom": "^15.0.0-rc.1"
},
"babel": {
"presets": [
Expand Down
2 changes: 1 addition & 1 deletion src/js/TabBar.js
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ let TabBar = React.createClass({

// TODO:
// Icon 应该支持用户自定义:
// React-native 采用 require('path/to/iocn') 的形式,
// React-native 采用 require('path/to/icon') 的形式,
// 这里可能需要再添加一个属性
TabBar.Item = React.createClass({
mixins: [ClassNameMixin],
Expand Down

0 comments on commit 9a8bbac

Please sign in to comment.