Skip to content

Commit

Permalink
🔨 Upgrade React to v16.0
Browse files Browse the repository at this point in the history
  • Loading branch information
shianqi committed Oct 7, 2017
1 parent bbd453a commit 27553a6
Show file tree
Hide file tree
Showing 4 changed files with 27 additions and 29 deletions.
48 changes: 24 additions & 24 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,35 +24,35 @@
},
"devDependencies": {
"assets-webpack-plugin": "^3.5.1",
"autoprefixer": "^7.1.3",
"autoprefixer": "^7.1.5",
"babel-core": "^6.26.0",
"babel-eslint": "^8.0.0",
"babel-eslint": "^8.0.1",
"babel-loader": "^7.1.2",
"babel-preset-env": "^1.6.0",
"babel-preset-react": "^6.24.1",
"babel-preset-stage-3": "^6.24.1",
"coveralls": "^2.13.1",
"css-loader": "^0.28.5",
"enzyme": "^2.9.1",
"eslint": "^4.5.0",
"coveralls": "^3.0.0",
"css-loader": "^0.28.7",
"enzyme": "^3.1.0",
"eslint": "^4.8.0",
"eslint-config-standard": "^10.2.1",
"eslint-friendly-formatter": "^3.0.0",
"eslint-loader": "^1.9.0",
"eslint-plugin-css-modules": "^2.7.5",
"eslint-plugin-html": "^3.2.0",
"eslint-plugin-html": "^3.2.2",
"eslint-plugin-import": "^2.7.0",
"eslint-plugin-node": "^5.1.1",
"eslint-plugin-node": "^5.2.0",
"eslint-plugin-promise": "^3.5.0",
"eslint-plugin-react": "^7.3.0",
"eslint-plugin-react": "^7.4.0",
"eslint-plugin-standard": "^3.0.1",
"extract-text-webpack-plugin": "^3.0.0",
"file-loader": "^0.11.2",
"extract-text-webpack-plugin": "^3.0.1",
"file-loader": "^1.1.5",
"gh-pages": "^1.0.0",
"html-webpack-plugin": "^2.30.1",
"jasmine": "^2.8.0",
"jasmine-core": "^2.8.0",
"jasmine-expect-jsx": "^2.0.0",
"karma": "^1.7.0",
"karma": "^1.7.1",
"karma-browserstack-launcher": "^1.3.0",
"karma-chrome-launcher": "^2.2.0",
"karma-coverage": "^1.1.1",
Expand All @@ -63,17 +63,17 @@
"karma-webpack": "^2.0.4",
"open-browser-webpack-plugin": "0.0.5",
"postcss-loader": "^2.0.6",
"react-addons-test-utils": "^15.6.0",
"react-scripts": "^1.0.12",
"react-test-renderer": "^15.6.1",
"react-addons-test-utils": "^15.6.2",
"react-scripts": "^1.0.14",
"react-test-renderer": "^16.0.0",
"redux-logger": "^3.0.6",
"rimraf": "^2.6.1",
"style-loader": "^0.18.2",
"stylelint": "^8.0.0",
"url-loader": "^0.5.9",
"webpack": "^3.5.5",
"rimraf": "^2.6.2",
"style-loader": "^0.19.0",
"stylelint": "^8.2.0",
"url-loader": "^0.6.2",
"webpack": "^3.6.0",
"webpack-bundle-analyzer": "^2.9.0",
"webpack-dev-server": "^2.7.1",
"webpack-dev-server": "^2.9.1",
"webpack-md5-hash": "0.0.5"
},
"dependencies": {
Expand All @@ -82,9 +82,9 @@
"history": "^4.7.2",
"isomorphic-fetch": "^2.2.1",
"normalize.css": "^7.0.0",
"prop-types": "^15.5.10",
"react": "^15.6.1",
"react-dom": "^15.6.1",
"prop-types": "^15.6.0",
"react": "^16.0.0",
"react-dom": "^16.0.0",
"react-hot-loader": "^3.0.0-beta.7",
"react-redux": "^5.0.6",
"react-router": "^4.2.0",
Expand Down
4 changes: 2 additions & 2 deletions src/actions/host.jsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// const baseURL = 'https://www.shianqi.com'
const baseURL = 'http://localhost:3000'
const baseURL = 'https://www.shianqi.com'
// const baseURL = 'http://localhost:3000'

//登录
export const loginURL = `${baseURL}/login/cellphone`
Expand Down
2 changes: 1 addition & 1 deletion src/components/Footer/index.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ class Footer extends Component {
dispatch,
playing
} = this.props
console.log('footer', playing)

const handlerPlay = ()=>{
dispatch(musicPlayer_play())
}
Expand Down
2 changes: 0 additions & 2 deletions src/components/MusicPlayer/index.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,9 @@ class MusicPlayer extends Component {
const { musicPlayer={} } = this.props
const audio = document.getElementById('musicPlayer')
const {
src,
playing
} = musicPlayer

console.log('didUpdate', playing)
if(audio&&playing) {
audio.play()
}else if(audio) {
Expand Down

0 comments on commit 27553a6

Please sign in to comment.