Skip to content

updated react to 16.1.1 #60

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

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

updated react to 16.1.1 #60

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9d4da7c
updated react to 16.1.1
bpizzi Nov 23, 2017
0713060
fixed types: added back react-redux and reverted react-router to 3.0.13
bpizzi Nov 28, 2017
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
55 changes: 43 additions & 12 deletions jspm.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,11 +102,11 @@ SystemJS.config({
"os": "npm:jspm-nodelibs-os@0.2.0",
"path": "npm:jspm-nodelibs-path@0.2.1",
"process": "npm:jspm-nodelibs-process@0.2.0",
"react": "npm:react@15.4.2",
"react-dom": "npm:react-dom@15.4.2",
"react-redux": "npm:react-redux@5.0.3",
"react": "npm:react@16.1.1",
"react-dom": "npm:react-dom@16.1.1",
"react-redux": "npm:react-redux@5.0.4",
"react-redux-typescript": "npm:react-redux-typescript@2.2.0",
"react-router": "npm:react-router@3.0.2",
"react-router": "npm:react-router@3.2.0",
"react-router-redux": "npm:react-router-redux@4.0.8",
"redux": "npm:redux@3.6.0",
"redux-observable": "npm:redux-observable@0.13.0",
Expand Down Expand Up @@ -389,27 +389,31 @@ SystemJS.config({
"minimalistic-crypto-utils": "npm:minimalistic-crypto-utils@1.0.1"
}
},
"npm:react-redux@5.0.3": {
"npm:react-redux@5.0.4": {
"map": {
"lodash": "npm:lodash@4.17.4",
"lodash-es": "npm:lodash-es@4.17.4",
"hoist-non-react-statics": "npm:hoist-non-react-statics@1.2.0",
"invariant": "npm:invariant@2.2.2",
"loose-envify": "npm:loose-envify@1.3.1"
"loose-envify": "npm:loose-envify@1.3.1",
"prop-types": "npm:prop-types@15.6.0",
"create-react-class": "npm:create-react-class@15.6.2"
}
},
"npm:react-dom@15.4.2": {
"npm:react-dom@16.1.1": {
"map": {
"fbjs": "npm:fbjs@0.8.9",
"loose-envify": "npm:loose-envify@1.3.1",
"object-assign": "npm:object-assign@4.1.1"
"object-assign": "npm:object-assign@4.1.1",
"prop-types": "npm:prop-types@15.6.0"
}
},
"npm:react@15.4.2": {
"npm:react@16.1.1": {
"map": {
"fbjs": "npm:fbjs@0.8.9",
"loose-envify": "npm:loose-envify@1.3.1",
"object-assign": "npm:object-assign@4.1.1"
"object-assign": "npm:object-assign@4.1.1",
"prop-types": "npm:prop-types@15.6.0"
}
},
"npm:fbjs@0.8.9": {
Expand Down Expand Up @@ -452,13 +456,15 @@ SystemJS.config({
"asn1.js": "npm:asn1.js@4.9.1"
}
},
"npm:react-router@3.0.2": {
"npm:react-router@3.2.0": {
"map": {
"warning": "npm:warning@3.0.0",
"loose-envify": "npm:loose-envify@1.3.1",
"history": "npm:history@3.3.0",
"hoist-non-react-statics": "npm:hoist-non-react-statics@1.2.0",
"invariant": "npm:invariant@2.2.2"
"invariant": "npm:invariant@2.2.2",
"prop-types": "npm:prop-types@15.6.0",
"create-react-class": "npm:create-react-class@15.6.2"
}
},
"npm:warning@3.0.0": {
Expand All @@ -479,6 +485,31 @@ SystemJS.config({
"object-assign": "npm:object-assign@4.1.1",
"strict-uri-encode": "npm:strict-uri-encode@1.1.0"
}
},
"npm:create-react-class@15.6.2": {
"map": {
"loose-envify": "npm:loose-envify@1.3.1",
"fbjs": "npm:fbjs@0.8.9",
"object-assign": "npm:object-assign@4.1.1"
}
},
"npm:prop-types@15.6.0": {
"map": {
"fbjs": "npm:fbjs@0.8.16",
"loose-envify": "npm:loose-envify@1.3.1",
"object-assign": "npm:object-assign@4.1.1"
}
},
"npm:fbjs@0.8.16": {
"map": {
"loose-envify": "npm:loose-envify@1.3.1",
"object-assign": "npm:object-assign@4.1.1",
"core-js": "npm:core-js@1.2.7",
"isomorphic-fetch": "npm:isomorphic-fetch@2.2.1",
"promise": "npm:promise@7.1.1",
"setimmediate": "npm:setimmediate@1.0.5",
"ua-parser-js": "npm:ua-parser-js@0.7.12"
}
}
}
});
19 changes: 10 additions & 9 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,17 +38,18 @@
"@types/classnames": "^0.0.32",
"@types/jest": "^19.2.2",
"@types/node": "^7.0.8",
"@types/react": "^15.0.16",
"@types/react-dom": "^0.14.20",
"@types/react-redux": "^4.4.37",
Copy link
Owner

@piotrwitek piotrwitek Nov 25, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

please add back react-redux types

"@types/react-router": "^3.0.5",
"@types/react-router-redux": "^4.0.41",
"@types/react": "^16.0.25",
"@types/react-dom": "^16.0.3",
"@types/react-redux": "^5.0.14",
"@types/react-router": "^3.0.13",
"@types/react-router-redux": "^5.0.10",
"@types/systemjs": "^0.19.33",
"husky": "^0.13.2",
"jest": "^19.0.2",
"jspm": "0.17.0-beta.32",
"jspm-hmr": "^1.0.0-rc6",
"react-redux-typescript": "^2.2.0",
"redux": "^3.7.2",
"redux-observable": "^0.14.1",
"regenerator": "^0.9.7",
"reselect": "^2.5.4",
Expand All @@ -69,10 +70,10 @@
"classnames": "npm:classnames@^2.2.5",
"csjs": "npm:csjs@^1.1.0",
"insert-css": "npm:insert-css@^1.1.0",
"react-dom": "npm:react-dom@^15.4.2",
"react-redux": "npm:react-redux@^5.0.3",
"react-dom": "npm:react-dom@^16.1.1",
"react-redux": "npm:react-redux@^5.0.4",
"react-redux-typescript": "npm:react-redux-typescript@^2.2.0",
"react-router": "npm:react-router@3.0.2",
"react-router": "npm:react-router@3.2.0",
"react-router-redux": "npm:react-router-redux@^4.0.8",
"redux-observable": "npm:redux-observable@^0.13.0",
"reselect": "npm:reselect@^2.5.4",
Expand Down Expand Up @@ -100,7 +101,7 @@
"os": "npm:jspm-nodelibs-os@^0.2.0",
"path": "npm:jspm-nodelibs-path@^0.2.0",
"process": "npm:jspm-nodelibs-process@^0.2.0",
"react": "npm:react@^15.4.2",
"react": "npm:react@^16.1.1",
"redux": "npm:redux@^3.6.0",
"rxjs": "npm:rxjs@^5.2.0",
"stream": "npm:jspm-nodelibs-stream@^0.2.0",
Expand Down
58 changes: 34 additions & 24 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,48 +6,58 @@
version "0.0.32"
resolved "https://registry.yarnpkg.com/@types/classnames/-/classnames-0.0.32.tgz#449abcd9a826807811ef101e58df9f83cfc61713"

"@types/history@*":
version "4.6.2"
resolved "https://registry.yarnpkg.com/@types/history/-/history-4.6.2.tgz#12cfaba693ba20f114ed5765467ff25fdf67ddb0"

"@types/history@^3":
version "3.2.1"
resolved "https://registry.yarnpkg.com/@types/history/-/history-3.2.1.tgz#0039ab0e0be2a0cc22bac171d27a44588103d123"
version "3.2.2"
resolved "https://registry.yarnpkg.com/@types/history/-/history-3.2.2.tgz#b6affa240cb10b5f841c6443d8a24d7f3fc8bb0c"

"@types/jest@^19.2.2":
version "19.2.2"
resolved "https://registry.yarnpkg.com/@types/jest/-/jest-19.2.2.tgz#71f428be2fa6eb9f15bb0abc3cade67905f94839"

"@types/node@*":
version "8.0.53"
resolved "https://registry.yarnpkg.com/@types/node/-/node-8.0.53.tgz#396b35af826fa66aad472c8cb7b8d5e277f4e6d8"

"@types/node@^7.0.8":
version "7.0.8"
resolved "https://registry.yarnpkg.com/@types/node/-/node-7.0.8.tgz#25e4dd804b630c916ae671233e6d71f6ce18124a"

"@types/react-dom@^0.14.20":
version "0.14.23"
resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-0.14.23.tgz#cecfcfad754b4c2765fe5d29b81b301889ad6c2e"
"@types/react-dom@^16.0.3":
version "16.0.3"
resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-16.0.3.tgz#8accad7eabdab4cca3e1a56f5ccb57de2da0ff64"
dependencies:
"@types/node" "*"
"@types/react" "*"

"@types/react-redux@^4.4.37":
version "4.4.37"
resolved "https://registry.yarnpkg.com/@types/react-redux/-/react-redux-4.4.37.tgz#14489a999cdfb0a05fb5c2335fa6c3c3e7c89ed5"
"@types/react-redux@^5.0.14":
version "5.0.14"
resolved "https://registry.yarnpkg.com/@types/react-redux/-/react-redux-5.0.14.tgz#f3fc30dcbb2d20455a714f591cc27f77b4df09bb"
dependencies:
"@types/react" "*"
redux "^3.6.0"

"@types/react-router-redux@^4.0.41":
version "4.0.43"
resolved "https://registry.yarnpkg.com/@types/react-router-redux/-/react-router-redux-4.0.43.tgz#b2170cdbe0e5254afb2b9b8c9f4697ad877f60f6"
"@types/react-router-redux@^5.0.10":
version "5.0.10"
resolved "https://registry.yarnpkg.com/@types/react-router-redux/-/react-router-redux-5.0.10.tgz#42f612fe6c608e2803b476c035ef81606bdd3bbf"
dependencies:
"@types/history" "^3"
redux "^3.6.0"
"@types/history" "*"
"@types/react" "*"
redux "^3.7.2"

"@types/react-router@^3.0.5":
version "3.0.8"
resolved "https://registry.yarnpkg.com/@types/react-router/-/react-router-3.0.8.tgz#cec0f2b90b7cd5305a0481a8b565115284796cb8"
"@types/react-router@^3.0.13":
version "3.0.13"
resolved "https://registry.yarnpkg.com/@types/react-router/-/react-router-3.0.13.tgz#493c2f0794313a37e4698deed9b816b2ad239716"
dependencies:
"@types/history" "^3"
"@types/react" "*"

"@types/react@*", "@types/react@^15.0.16":
version "15.0.16"
resolved "https://registry.yarnpkg.com/@types/react/-/react-15.0.16.tgz#78e39511a9cfcabf7f74ecd55180522f4290a0c1"
"@types/react@*", "@types/react@^16.0.25":
version "16.0.25"
resolved "https://registry.yarnpkg.com/@types/react/-/react-16.0.25.tgz#bf696b83fe480c5e0eff4335ee39ebc95884a1ed"

"@types/systemjs@^0.19.33":
version "0.19.33"
Expand Down Expand Up @@ -3230,14 +3240,14 @@ redux-observable@^0.14.1:
version "0.14.1"
resolved "https://registry.yarnpkg.com/redux-observable/-/redux-observable-0.14.1.tgz#9f3d870c69388fdc427ded6770a3e326f3b69693"

redux@^3.6.0:
version "3.6.0"
resolved "https://registry.yarnpkg.com/redux/-/redux-3.6.0.tgz#887c2b3d0b9bd86eca2be70571c27654c19e188d"
redux@^3.6.0, redux@^3.7.2:
version "3.7.2"
resolved "https://registry.yarnpkg.com/redux/-/redux-3.7.2.tgz#06b73123215901d25d065be342eb026bc1c8537b"
dependencies:
lodash "^4.2.1"
lodash-es "^4.2.1"
loose-envify "^1.1.0"
symbol-observable "^1.0.2"
symbol-observable "^1.0.3"

regenerator-preset@^0.9.6:
version "0.9.6"
Expand Down Expand Up @@ -3730,7 +3740,7 @@ supports-color@^3.1.0, supports-color@^3.1.2:
dependencies:
has-flag "^1.0.0"

symbol-observable@^1.0.1, symbol-observable@^1.0.2:
symbol-observable@^1.0.1, symbol-observable@^1.0.3:
version "1.0.4"
resolved "https://registry.yarnpkg.com/symbol-observable/-/symbol-observable-1.0.4.tgz#29bf615d4aa7121bdd898b22d4b3f9bc4e2aa03d"

Expand Down