Skip to content

Commit

Permalink
[5.4.5] Upgrade React from 15 to 16
Browse files Browse the repository at this point in the history
  • Loading branch information
kirainmoe committed Sep 27, 2017
1 parent 72f668e commit 7d79b0e
Show file tree
Hide file tree
Showing 8 changed files with 53 additions and 42 deletions.
2 changes: 1 addition & 1 deletion dist/assets/muse-player-preact.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/assets/muse-player-react-lite.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/assets/muse-player.js

Large diffs are not rendered by default.

12 changes: 6 additions & 6 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "muse-player",
"version": "5.4.3",
"version": "5.4.5",
"description": "Just a simple and dilligent HTML5 Audio Player written in React.",
"main": "dist/assets/muse-player.js",
"scripts": {
Expand Down Expand Up @@ -40,7 +40,7 @@
"license": "MIT",
"devDependencies": {
"babel-core": "^6.0.0",
"babel-eslint": "^8.0.0",
"babel-eslint": "^8.0.1",
"babel-loader": "^7.1.2",
"babel-plugin-transform-decorators": "^6.24.1",
"babel-plugin-transform-decorators-legacy": "^1.3.4",
Expand All @@ -55,7 +55,7 @@
"css-loader": "^0.28.5",
"eslint": "^4.7.0",
"eslint-loader": "^1.0.0",
"eslint-plugin-react": "^7.3.0",
"eslint-plugin-react": "^7.4.0",
"file-loader": "^0.11.2",
"glob": "^7.0.0",
"isparta-instrumenter-loader": "^1.0.0",
Expand All @@ -71,7 +71,7 @@
"mocha": "^3.5.3",
"null-loader": "^0.1.1",
"open": "0.0.5",
"react-addons-test-utils": "^15.0.0",
"react-addons-test-utils": "^15.6.2",
"react-hot-loader": "^v3.0.0-beta.6",
"rimraf": "^2.6.2",
"style-loader": "^0.18.2",
Expand All @@ -88,8 +88,8 @@
"normalize.css": "^7.0.0",
"preact": "^8.2.5",
"preact-compat": "^3.17.0",
"react": "^15.0.0",
"react-dom": "^15.0.0",
"react": "^16.0.0",
"react-dom": "^16.0.0",
"react-lite": "^0.15.38",
"stylus": "^0.54.5"
}
Expand Down
2 changes: 1 addition & 1 deletion src/config/base.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@

// Settings configured here will be merged into the final config object.
export default {
MUSE_VERSION: '5.4.3'
MUSE_VERSION: '5.4.5'
}
File renamed without changes.
4 changes: 2 additions & 2 deletions src/containers/UIContainer.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { observable, autorun } from 'mobx';
import { observer } from 'mobx-react';

// Containers
import ControlContainer from './ControlContainer';
import ControllerContainer from './ControllerContainer';
import SelectorContainer from './SelectorContainer';
import DrawerContainer from './DrawerContainer';
import MenuContainer from './MenuContainer';
Expand Down Expand Up @@ -204,7 +204,7 @@ export default class UIContainer extends Component {

<SelectorContainer parent={this} id={id} store={this.props.store} />
<MenuContainer store={store} parent={this} id={id} />
<ControlContainer
<ControllerContainer
parent={this}
store={store}
id={id}
Expand Down
71 changes: 41 additions & 30 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -316,9 +316,9 @@ babel-core@^6.0.0, babel-core@^6.1.4, babel-core@^6.26.0:
slash "^1.0.0"
source-map "^0.5.6"

babel-eslint@^8.0.0:
version "8.0.0"
resolved "https://registry.npmjs.org/babel-eslint/-/babel-eslint-8.0.0.tgz#ce06f385bdfb5b6d7e603f06222f891abd14c240"
babel-eslint@^8.0.1:
version "8.0.1"
resolved "https://registry.yarnpkg.com/babel-eslint/-/babel-eslint-8.0.1.tgz#5d718be7a328625d006022eb293ed3008cbd6346"
dependencies:
babel-code-frame "7.0.0-beta.0"
babel-traverse "7.0.0-beta.0"
Expand Down Expand Up @@ -1672,14 +1672,6 @@ create-hmac@^1.1.0, create-hmac@^1.1.2, create-hmac@^1.1.4:
safe-buffer "^5.0.1"
sha.js "^2.4.8"

create-react-class@^15.6.0:
version "15.6.0"
resolved "https://registry.npmjs.org/create-react-class/-/create-react-class-15.6.0.tgz#ab448497c26566e1e29413e883207d57cfe7bed4"
dependencies:
fbjs "^0.8.9"
loose-envify "^1.3.1"
object-assign "^4.1.1"

cross-spawn@^5.0.1, cross-spawn@^5.1.0:
version "5.1.0"
resolved "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz#e8bd0efee58fcff6f8f94510a0a554bbfa235449"
Expand Down Expand Up @@ -2234,9 +2226,9 @@ eslint-loader@^1.0.0:
object-hash "^1.1.4"
rimraf "^2.6.1"

eslint-plugin-react@^7.3.0:
version "7.3.0"
resolved "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.3.0.tgz#ca9368da36f733fbdc05718ae4e91f778f38e344"
eslint-plugin-react@^7.4.0:
version "7.4.0"
resolved "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.4.0.tgz#300a95861b9729c087d362dd64abcc351a74364a"
dependencies:
doctrine "^2.0.0"
has "^1.0.1"
Expand Down Expand Up @@ -2482,6 +2474,18 @@ faye-websocket@~0.11.0:
dependencies:
websocket-driver ">=0.5.1"

fbjs@^0.8.16:
version "0.8.16"
resolved "https://registry.yarnpkg.com/fbjs/-/fbjs-0.8.16.tgz#5e67432f550dc41b572bf55847b8aca64e5337db"
dependencies:
core-js "^1.0.0"
isomorphic-fetch "^2.1.1"
loose-envify "^1.0.0"
object-assign "^4.1.0"
promise "^7.1.1"
setimmediate "^1.0.5"
ua-parser-js "^0.7.9"

fbjs@^0.8.9:
version "0.8.15"
resolved "https://registry.npmjs.org/fbjs/-/fbjs-0.8.15.tgz#4f0695fdfcc16c37c0b07facec8cb4c4091685b9"
Expand Down Expand Up @@ -4809,6 +4813,14 @@ prop-types@^15.5.10, prop-types@^15.5.4, prop-types@^15.5.8:
fbjs "^0.8.9"
loose-envify "^1.3.1"

prop-types@^15.6.0:
version "15.6.0"
resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.6.0.tgz#ceaf083022fc46b4a35f69e13ef75aed0d639856"
dependencies:
fbjs "^0.8.16"
loose-envify "^1.3.1"
object-assign "^4.1.1"

proxy-addr@~1.1.5:
version "1.1.5"
resolved "https://registry.npmjs.org/proxy-addr/-/proxy-addr-1.1.5.tgz#71c0ee3b102de3f202f3b64f608d173fcba1a918"
Expand Down Expand Up @@ -4920,22 +4932,22 @@ rc@^1.1.7:
minimist "^1.2.0"
strip-json-comments "~2.0.1"

react-addons-test-utils@^15.0.0:
version "15.6.0"
resolved "https://registry.npmjs.org/react-addons-test-utils/-/react-addons-test-utils-15.6.0.tgz#062d36117fe8d18f3ba5e06eb33383b0b85ea5b9"
react-addons-test-utils@^15.6.2:
version "15.6.2"
resolved "https://registry.yarnpkg.com/react-addons-test-utils/-/react-addons-test-utils-15.6.2.tgz#c12b6efdc2247c10da7b8770d185080a7b047156"

react-deep-force-update@^2.0.1:
version "2.1.1"
resolved "https://registry.npmjs.org/react-deep-force-update/-/react-deep-force-update-2.1.1.tgz#8ea4263cd6455a050b37445b3f08fd839d86e909"

react-dom@^15.0.0:
version "15.6.1"
resolved "https://registry.npmjs.org/react-dom/-/react-dom-15.6.1.tgz#2cb0ed4191038e53c209eb3a79a23e2a4cf99470"
react-dom@^16.0.0:
version "16.0.0"
resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-16.0.0.tgz#9cc3079c3dcd70d4c6e01b84aab2a7e34c303f58"
dependencies:
fbjs "^0.8.9"
fbjs "^0.8.16"
loose-envify "^1.1.0"
object-assign "^4.1.0"
prop-types "^15.5.10"
object-assign "^4.1.1"
prop-types "^15.6.0"

react-hot-loader@^v3.0.0-beta.6:
version "3.0.0-beta.7"
Expand All @@ -4958,15 +4970,14 @@ react-proxy@^3.0.0-alpha.0:
dependencies:
lodash "^4.6.1"

react@^15.0.0:
version "15.6.1"
resolved "https://registry.npmjs.org/react/-/react-15.6.1.tgz#baa8434ec6780bde997cdc380b79cd33b96393df"
react@^16.0.0:
version "16.0.0"
resolved "https://registry.yarnpkg.com/react/-/react-16.0.0.tgz#ce7df8f1941b036f02b2cca9dbd0cb1f0e855e2d"
dependencies:
create-react-class "^15.6.0"
fbjs "^0.8.9"
fbjs "^0.8.16"
loose-envify "^1.1.0"
object-assign "^4.1.0"
prop-types "^15.5.10"
object-assign "^4.1.1"
prop-types "^15.6.0"

read-pkg-up@^1.0.1:
version "1.0.1"
Expand Down

0 comments on commit 7d79b0e

Please sign in to comment.