From 9d4da7cd21b8281515f996b07405bd473ba5412f Mon Sep 17 00:00:00 2001 From: bpizzi Date: Thu, 23 Nov 2017 16:33:47 +0100 Subject: [PATCH 1/2] updated react to 16.1.1 --- jspm.config.js | 55 +++++++++++++++++++++++++++++++++++++++----------- package.json | 18 ++++++++--------- yarn.lock | 54 +++---------------------------------------------- 3 files changed, 55 insertions(+), 72 deletions(-) diff --git a/jspm.config.js b/jspm.config.js index 033b01a..0dc83ef 100644 --- a/jspm.config.js +++ b/jspm.config.js @@ -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", @@ -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": { @@ -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": { @@ -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" + } } } }); diff --git a/package.json b/package.json index faaa4ff..0295248 100644 --- a/package.json +++ b/package.json @@ -38,17 +38,17 @@ "@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", - "@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-router": "^4.0.18", + "@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", @@ -69,10 +69,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", @@ -100,7 +100,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", diff --git a/yarn.lock b/yarn.lock index d5ec486..7122f5e 100644 --- a/yarn.lock +++ b/yarn.lock @@ -6,10 +6,6 @@ version "0.0.32" resolved "https://registry.yarnpkg.com/@types/classnames/-/classnames-0.0.32.tgz#449abcd9a826807811ef101e58df9f83cfc61713" -"@types/history@^3": - version "3.2.1" - resolved "https://registry.yarnpkg.com/@types/history/-/history-3.2.1.tgz#0039ab0e0be2a0cc22bac171d27a44588103d123" - "@types/jest@^19.2.2": version "19.2.2" resolved "https://registry.yarnpkg.com/@types/jest/-/jest-19.2.2.tgz#71f428be2fa6eb9f15bb0abc3cade67905f94839" @@ -18,37 +14,6 @@ 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" - dependencies: - "@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" - 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" - dependencies: - "@types/history" "^3" - redux "^3.6.0" - -"@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" - 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/systemjs@^0.19.33": version "0.19.33" resolved "https://registry.yarnpkg.com/@types/systemjs/-/systemjs-0.19.33.tgz#47c47e7639867b6694beb3f60c4f53ad55eb1b13" @@ -2453,10 +2418,6 @@ locate-path@^2.0.0: p-locate "^2.0.0" path-exists "^3.0.0" -lodash-es@^4.2.1: - version "4.17.4" - resolved "https://registry.yarnpkg.com/lodash-es/-/lodash-es-4.17.4.tgz#dcc1d7552e150a0640073ba9cb31d70f032950e7" - lodash._basecopy@^3.0.0: version "3.0.1" resolved "https://registry.yarnpkg.com/lodash._basecopy/-/lodash._basecopy-3.0.1.tgz#8da0e6a876cf344c0ad8a54882111dd3c5c7ca36" @@ -2580,7 +2541,7 @@ lodash.templatesettings@^3.0.0: lodash._reinterpolate "^3.0.0" lodash.escape "^3.0.0" -lodash@^4.14.0, lodash@^4.2.0, lodash@^4.2.1: +lodash@^4.14.0, lodash@^4.2.0: version "4.17.4" resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.4.tgz#78203a4d1c328ae1d86dca6460e369b57f4055ae" @@ -2588,7 +2549,7 @@ longest@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/longest/-/longest-1.0.1.tgz#30a0b2da38f73770e8294a0d22e6625ed77d0097" -loose-envify@^1.0.0, loose-envify@^1.1.0: +loose-envify@^1.0.0: version "1.3.1" resolved "https://registry.yarnpkg.com/loose-envify/-/loose-envify-1.3.1.tgz#d1a8ad33fa9ce0e713d65fdd0ac8b748d478c848" dependencies: @@ -3230,15 +3191,6 @@ 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" - dependencies: - lodash "^4.2.1" - lodash-es "^4.2.1" - loose-envify "^1.1.0" - symbol-observable "^1.0.2" - regenerator-preset@^0.9.6: version "0.9.6" resolved "https://registry.yarnpkg.com/regenerator-preset/-/regenerator-preset-0.9.6.tgz#5247445e3600fa95cfb336f903de6969f1290940" @@ -3730,7 +3682,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: version "1.0.4" resolved "https://registry.yarnpkg.com/symbol-observable/-/symbol-observable-1.0.4.tgz#29bf615d4aa7121bdd898b22d4b3f9bc4e2aa03d" From 0713060110ef38d3ed205054c4d5373d4739d732 Mon Sep 17 00:00:00 2001 From: bpizzi Date: Tue, 28 Nov 2017 11:11:58 +0100 Subject: [PATCH 2/2] fixed types: added back react-redux and reverted react-router to 3.0.13 --- package.json | 3 ++- yarn.lock | 64 +++++++++++++++++++++++++++++++++++++++++++++++++--- 2 files changed, 63 insertions(+), 4 deletions(-) diff --git a/package.json b/package.json index 0295248..80b74dc 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,8 @@ "@types/node": "^7.0.8", "@types/react": "^16.0.25", "@types/react-dom": "^16.0.3", - "@types/react-router": "^4.0.18", + "@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", diff --git a/yarn.lock b/yarn.lock index 7122f5e..aff0dfe 100644 --- a/yarn.lock +++ b/yarn.lock @@ -6,14 +6,59 @@ 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.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@^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@^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@^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" "*" + "@types/react" "*" + redux "^3.7.2" + +"@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@^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" resolved "https://registry.yarnpkg.com/@types/systemjs/-/systemjs-0.19.33.tgz#47c47e7639867b6694beb3f60c4f53ad55eb1b13" @@ -2418,6 +2463,10 @@ locate-path@^2.0.0: p-locate "^2.0.0" path-exists "^3.0.0" +lodash-es@^4.2.1: + version "4.17.4" + resolved "https://registry.yarnpkg.com/lodash-es/-/lodash-es-4.17.4.tgz#dcc1d7552e150a0640073ba9cb31d70f032950e7" + lodash._basecopy@^3.0.0: version "3.0.1" resolved "https://registry.yarnpkg.com/lodash._basecopy/-/lodash._basecopy-3.0.1.tgz#8da0e6a876cf344c0ad8a54882111dd3c5c7ca36" @@ -2541,7 +2590,7 @@ lodash.templatesettings@^3.0.0: lodash._reinterpolate "^3.0.0" lodash.escape "^3.0.0" -lodash@^4.14.0, lodash@^4.2.0: +lodash@^4.14.0, lodash@^4.2.0, lodash@^4.2.1: version "4.17.4" resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.4.tgz#78203a4d1c328ae1d86dca6460e369b57f4055ae" @@ -2549,7 +2598,7 @@ longest@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/longest/-/longest-1.0.1.tgz#30a0b2da38f73770e8294a0d22e6625ed77d0097" -loose-envify@^1.0.0: +loose-envify@^1.0.0, loose-envify@^1.1.0: version "1.3.1" resolved "https://registry.yarnpkg.com/loose-envify/-/loose-envify-1.3.1.tgz#d1a8ad33fa9ce0e713d65fdd0ac8b748d478c848" dependencies: @@ -3191,6 +3240,15 @@ 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, 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.3" + regenerator-preset@^0.9.6: version "0.9.6" resolved "https://registry.yarnpkg.com/regenerator-preset/-/regenerator-preset-0.9.6.tgz#5247445e3600fa95cfb336f903de6969f1290940" @@ -3682,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.1, symbol-observable@^1.0.3: version "1.0.4" resolved "https://registry.yarnpkg.com/symbol-observable/-/symbol-observable-1.0.4.tgz#29bf615d4aa7121bdd898b22d4b3f9bc4e2aa03d"