Skip to content

Commit 7d79b0e

Browse files
committed
[5.4.5] Upgrade React from 15 to 16
1 parent 72f668e commit 7d79b0e

8 files changed

Lines changed: 53 additions & 42 deletions

File tree

dist/assets/muse-player-preact.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/assets/muse-player-react-lite.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/assets/muse-player.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "muse-player",
3-
"version": "5.4.3",
3+
"version": "5.4.5",
44
"description": "Just a simple and dilligent HTML5 Audio Player written in React.",
55
"main": "dist/assets/muse-player.js",
66
"scripts": {
@@ -40,7 +40,7 @@
4040
"license": "MIT",
4141
"devDependencies": {
4242
"babel-core": "^6.0.0",
43-
"babel-eslint": "^8.0.0",
43+
"babel-eslint": "^8.0.1",
4444
"babel-loader": "^7.1.2",
4545
"babel-plugin-transform-decorators": "^6.24.1",
4646
"babel-plugin-transform-decorators-legacy": "^1.3.4",
@@ -55,7 +55,7 @@
5555
"css-loader": "^0.28.5",
5656
"eslint": "^4.7.0",
5757
"eslint-loader": "^1.0.0",
58-
"eslint-plugin-react": "^7.3.0",
58+
"eslint-plugin-react": "^7.4.0",
5959
"file-loader": "^0.11.2",
6060
"glob": "^7.0.0",
6161
"isparta-instrumenter-loader": "^1.0.0",
@@ -71,7 +71,7 @@
7171
"mocha": "^3.5.3",
7272
"null-loader": "^0.1.1",
7373
"open": "0.0.5",
74-
"react-addons-test-utils": "^15.0.0",
74+
"react-addons-test-utils": "^15.6.2",
7575
"react-hot-loader": "^v3.0.0-beta.6",
7676
"rimraf": "^2.6.2",
7777
"style-loader": "^0.18.2",
@@ -88,8 +88,8 @@
8888
"normalize.css": "^7.0.0",
8989
"preact": "^8.2.5",
9090
"preact-compat": "^3.17.0",
91-
"react": "^15.0.0",
92-
"react-dom": "^15.0.0",
91+
"react": "^16.0.0",
92+
"react-dom": "^16.0.0",
9393
"react-lite": "^0.15.38",
9494
"stylus": "^0.54.5"
9595
}

src/config/base.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@
22

33
// Settings configured here will be merged into the final config object.
44
export default {
5-
MUSE_VERSION: '5.4.3'
5+
MUSE_VERSION: '5.4.5'
66
}

src/containers/UIContainer.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import { observable, autorun } from 'mobx';
44
import { observer } from 'mobx-react';
55

66
// Containers
7-
import ControlContainer from './ControlContainer';
7+
import ControllerContainer from './ControllerContainer';
88
import SelectorContainer from './SelectorContainer';
99
import DrawerContainer from './DrawerContainer';
1010
import MenuContainer from './MenuContainer';
@@ -204,7 +204,7 @@ export default class UIContainer extends Component {
204204

205205
<SelectorContainer parent={this} id={id} store={this.props.store} />
206206
<MenuContainer store={store} parent={this} id={id} />
207-
<ControlContainer
207+
<ControllerContainer
208208
parent={this}
209209
store={store}
210210
id={id}

yarn.lock

Lines changed: 41 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -316,9 +316,9 @@ babel-core@^6.0.0, babel-core@^6.1.4, babel-core@^6.26.0:
316316
slash "^1.0.0"
317317
source-map "^0.5.6"
318318

319-
babel-eslint@^8.0.0:
320-
version "8.0.0"
321-
resolved "https://registry.npmjs.org/babel-eslint/-/babel-eslint-8.0.0.tgz#ce06f385bdfb5b6d7e603f06222f891abd14c240"
319+
babel-eslint@^8.0.1:
320+
version "8.0.1"
321+
resolved "https://registry.yarnpkg.com/babel-eslint/-/babel-eslint-8.0.1.tgz#5d718be7a328625d006022eb293ed3008cbd6346"
322322
dependencies:
323323
babel-code-frame "7.0.0-beta.0"
324324
babel-traverse "7.0.0-beta.0"
@@ -1672,14 +1672,6 @@ create-hmac@^1.1.0, create-hmac@^1.1.2, create-hmac@^1.1.4:
16721672
safe-buffer "^5.0.1"
16731673
sha.js "^2.4.8"
16741674

1675-
create-react-class@^15.6.0:
1676-
version "15.6.0"
1677-
resolved "https://registry.npmjs.org/create-react-class/-/create-react-class-15.6.0.tgz#ab448497c26566e1e29413e883207d57cfe7bed4"
1678-
dependencies:
1679-
fbjs "^0.8.9"
1680-
loose-envify "^1.3.1"
1681-
object-assign "^4.1.1"
1682-
16831675
cross-spawn@^5.0.1, cross-spawn@^5.1.0:
16841676
version "5.1.0"
16851677
resolved "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz#e8bd0efee58fcff6f8f94510a0a554bbfa235449"
@@ -2234,9 +2226,9 @@ eslint-loader@^1.0.0:
22342226
object-hash "^1.1.4"
22352227
rimraf "^2.6.1"
22362228

2237-
eslint-plugin-react@^7.3.0:
2238-
version "7.3.0"
2239-
resolved "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.3.0.tgz#ca9368da36f733fbdc05718ae4e91f778f38e344"
2229+
eslint-plugin-react@^7.4.0:
2230+
version "7.4.0"
2231+
resolved "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.4.0.tgz#300a95861b9729c087d362dd64abcc351a74364a"
22402232
dependencies:
22412233
doctrine "^2.0.0"
22422234
has "^1.0.1"
@@ -2482,6 +2474,18 @@ faye-websocket@~0.11.0:
24822474
dependencies:
24832475
websocket-driver ">=0.5.1"
24842476

2477+
fbjs@^0.8.16:
2478+
version "0.8.16"
2479+
resolved "https://registry.yarnpkg.com/fbjs/-/fbjs-0.8.16.tgz#5e67432f550dc41b572bf55847b8aca64e5337db"
2480+
dependencies:
2481+
core-js "^1.0.0"
2482+
isomorphic-fetch "^2.1.1"
2483+
loose-envify "^1.0.0"
2484+
object-assign "^4.1.0"
2485+
promise "^7.1.1"
2486+
setimmediate "^1.0.5"
2487+
ua-parser-js "^0.7.9"
2488+
24852489
fbjs@^0.8.9:
24862490
version "0.8.15"
24872491
resolved "https://registry.npmjs.org/fbjs/-/fbjs-0.8.15.tgz#4f0695fdfcc16c37c0b07facec8cb4c4091685b9"
@@ -4809,6 +4813,14 @@ prop-types@^15.5.10, prop-types@^15.5.4, prop-types@^15.5.8:
48094813
fbjs "^0.8.9"
48104814
loose-envify "^1.3.1"
48114815

4816+
prop-types@^15.6.0:
4817+
version "15.6.0"
4818+
resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.6.0.tgz#ceaf083022fc46b4a35f69e13ef75aed0d639856"
4819+
dependencies:
4820+
fbjs "^0.8.16"
4821+
loose-envify "^1.3.1"
4822+
object-assign "^4.1.1"
4823+
48124824
proxy-addr@~1.1.5:
48134825
version "1.1.5"
48144826
resolved "https://registry.npmjs.org/proxy-addr/-/proxy-addr-1.1.5.tgz#71c0ee3b102de3f202f3b64f608d173fcba1a918"
@@ -4920,22 +4932,22 @@ rc@^1.1.7:
49204932
minimist "^1.2.0"
49214933
strip-json-comments "~2.0.1"
49224934

4923-
react-addons-test-utils@^15.0.0:
4924-
version "15.6.0"
4925-
resolved "https://registry.npmjs.org/react-addons-test-utils/-/react-addons-test-utils-15.6.0.tgz#062d36117fe8d18f3ba5e06eb33383b0b85ea5b9"
4935+
react-addons-test-utils@^15.6.2:
4936+
version "15.6.2"
4937+
resolved "https://registry.yarnpkg.com/react-addons-test-utils/-/react-addons-test-utils-15.6.2.tgz#c12b6efdc2247c10da7b8770d185080a7b047156"
49264938

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

4931-
react-dom@^15.0.0:
4932-
version "15.6.1"
4933-
resolved "https://registry.npmjs.org/react-dom/-/react-dom-15.6.1.tgz#2cb0ed4191038e53c209eb3a79a23e2a4cf99470"
4943+
react-dom@^16.0.0:
4944+
version "16.0.0"
4945+
resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-16.0.0.tgz#9cc3079c3dcd70d4c6e01b84aab2a7e34c303f58"
49344946
dependencies:
4935-
fbjs "^0.8.9"
4947+
fbjs "^0.8.16"
49364948
loose-envify "^1.1.0"
4937-
object-assign "^4.1.0"
4938-
prop-types "^15.5.10"
4949+
object-assign "^4.1.1"
4950+
prop-types "^15.6.0"
49394951

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

4961-
react@^15.0.0:
4962-
version "15.6.1"
4963-
resolved "https://registry.npmjs.org/react/-/react-15.6.1.tgz#baa8434ec6780bde997cdc380b79cd33b96393df"
4973+
react@^16.0.0:
4974+
version "16.0.0"
4975+
resolved "https://registry.yarnpkg.com/react/-/react-16.0.0.tgz#ce7df8f1941b036f02b2cca9dbd0cb1f0e855e2d"
49644976
dependencies:
4965-
create-react-class "^15.6.0"
4966-
fbjs "^0.8.9"
4977+
fbjs "^0.8.16"
49674978
loose-envify "^1.1.0"
4968-
object-assign "^4.1.0"
4969-
prop-types "^15.5.10"
4979+
object-assign "^4.1.1"
4980+
prop-types "^15.6.0"
49704981

49714982
read-pkg-up@^1.0.1:
49724983
version "1.0.1"

0 commit comments

Comments
 (0)