From 7017ed3458ae08ce16faaab26271fb2bad95d5e9 Mon Sep 17 00:00:00 2001 From: Chaiwat Ekkaewnumchai Date: Tue, 29 Oct 2019 12:12:48 -0700 Subject: [PATCH] Update React-Redux Summary: D18169584 introduced state error which I didn't notice. This diff reverted the diff. `hg backout D18169584` Original commit changeset: 77a8b034c5e4 Reviewed By: jknoxville Differential Revision: D18203354 fbshipit-source-id: 3e281f1e8c7e1d2bf41665adfa5ce5f13daca3a1 --- package.json | 8 ++++-- scripts/build-utils.js | 2 +- scripts/start-dev-server.js | 2 +- static/compilePlugins.js | 2 +- yarn.lock | 57 ++++++++++++++----------------------- 5 files changed, 30 insertions(+), 41 deletions(-) diff --git a/package.json b/package.json index 767106a5e..a9c4a0980 100644 --- a/package.json +++ b/package.json @@ -72,7 +72,7 @@ "@types/lodash.isequal": "^4.5.5", "@types/react": "16.9.11", "@types/react-dom": "^16.9.2", - "@types/react-redux": "^7.1.4", + "@types/react-redux": "^7.1.1", "@types/react-virtualized-auto-sizer": "^1.0.0", "@types/react-window": "^1.8.1", "@types/redux-persist": "^4.3.1", @@ -155,8 +155,8 @@ "react-devtools-core": "^4.0.6", "react-dom": "^16.11.0", "react-emotion": "^9.2.6", - "react-redux": "^7.1.1", - "react-test-renderer": "^16.9.9", + "react-redux": "^5.0.7", + "react-test-renderer": "^16.11.0", "react-transition-group": "^4.3.0", "react-virtualized-auto-sizer": "^1.0.2", "react-window": "^1.3.1", @@ -179,10 +179,12 @@ }, "greenkeeper": { "ignore": [ + "@types/react-redux", "electron", "electron-builder", "emotion", "react-emotion", + "react-redux", "tmp" ] }, diff --git a/scripts/build-utils.js b/scripts/build-utils.js index 7819bd88d..7a1f1d88e 100644 --- a/scripts/build-utils.js +++ b/scripts/build-utils.js @@ -66,7 +66,7 @@ function compile(buildFolder, entry) { ), }, resolver: { - blacklistRE: /(\/(sonar|flipper-public)\/dist\/)|(.*\.native\.js)/, + blacklistRE: /\/(sonar|flipper-public)\/dist\//, }, }, { diff --git a/scripts/start-dev-server.js b/scripts/start-dev-server.js index 4ec72f5a3..8f8a46ca3 100644 --- a/scripts/start-dev-server.js +++ b/scripts/start-dev-server.js @@ -67,7 +67,7 @@ function startMetroServer(app) { ), }, resolver: { - blacklistRE: /(\/(sonar|flipper)\/dist\/)|(.*\.native\.js)/, + blacklistRE: /\/(sonar|flipper)\/dist\//, }, watch: true, }).then(metroBundlerServer => { diff --git a/static/compilePlugins.js b/static/compilePlugins.js index 425bea438..130b0e51c 100644 --- a/static/compilePlugins.js +++ b/static/compilePlugins.js @@ -215,7 +215,7 @@ async function compilePlugin( }, resolver: { sourceExts: ['tsx', 'ts', 'js'], - blacklistRE: /(\/(sonar|flipper-public)\/dist\/)|(.*\.native\.js)/, + blacklistRE: /\/(sonar|flipper-public)\/dist\//, }, }, { diff --git a/yarn.lock b/yarn.lock index 6539e6ccf..6b88681d6 100644 --- a/yarn.lock +++ b/yarn.lock @@ -702,21 +702,7 @@ pirates "^4.0.0" source-map-support "^0.5.9" -"@babel/runtime@^7.0.0", "@babel/runtime@^7.1.5", "@babel/runtime@^7.4.2", "@babel/runtime@^7.4.5": - version "7.5.5" - resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.5.5.tgz#74fba56d35efbeca444091c7850ccd494fd2f132" - integrity sha512-28QvEGyQyNkB0/m2B4FU7IEZGK2NUrcMtT6BZEFALTguLk+AUT6ofsHtPk5QyjAdUkpMJ+/Em+quwz4HOt30AQ== - dependencies: - regenerator-runtime "^0.13.2" - -"@babel/runtime@^7.5.5", "@babel/runtime@^7.6.0": - version "7.6.2" - resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.6.2.tgz#c3d6e41b304ef10dcf13777a33e7694ec4a9a6dd" - integrity sha512-EXxN64agfUqqIGeEjI5dL5z0Sw0ZwWo1mLTi4mQowCZ42O59b7DRpZAnTC6OqdF28wMBMFKNb/4uFGrVaigSpg== - dependencies: - regenerator-runtime "^0.13.2" - -"@babel/runtime@^7.6.2", "@babel/runtime@^7.6.3": +"@babel/runtime@^7.0.0", "@babel/runtime@^7.1.2", "@babel/runtime@^7.1.5", "@babel/runtime@^7.4.2", "@babel/runtime@^7.4.5", "@babel/runtime@^7.5.5", "@babel/runtime@^7.6.0", "@babel/runtime@^7.6.2", "@babel/runtime@^7.6.3": version "7.6.3" resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.6.3.tgz#935122c74c73d2240cafd32ddb5fc2a6cd35cf1f" integrity sha512-kq6anf9JGjW8Nt5rYfEuGRaEAaH1mkv3Bbu6rYvLOpPh/RusSJXuKPEAoZ7L7gybZkchE8+NV5g9vKF4AGAtsA== @@ -1279,10 +1265,10 @@ dependencies: "@types/react" "*" -"@types/react-redux@^7.1.4": - version "7.1.4" - resolved "https://registry.yarnpkg.com/@types/react-redux/-/react-redux-7.1.4.tgz#e0d02a073e730b8b58a6341bddca2ea692ff0bce" - integrity sha512-SUV/7d+4L7C1Db/D4pqASgN1V1U2HnDEhEol9lYpPSguS76xFboZzf5ha2hTz6v31cUewyC7WksMh1q8JxhebQ== +"@types/react-redux@^7.1.1": + version "7.1.5" + resolved "https://registry.yarnpkg.com/@types/react-redux/-/react-redux-7.1.5.tgz#c7a528d538969250347aa53c52241051cf886bd3" + integrity sha512-ZoNGQMDxh5ENY7PzU7MVonxDzS1l/EWiy8nUhDqxFqUZn4ovboCyvk4Djf68x6COb7vhGTKjyjxHxtFdAA5sUA== dependencies: "@types/hoist-non-react-statics" "^3.3.0" "@types/react" "*" @@ -6699,7 +6685,7 @@ prompts@^2.0.1: kleur "^3.0.3" sisteransi "^1.0.3" -prop-types@^15.5.10, prop-types@^15.6.0, prop-types@^15.6.2, prop-types@^15.7.2: +prop-types@^15.5.10, prop-types@^15.6.0, prop-types@^15.6.1, prop-types@^15.6.2, prop-types@^15.7.2: version "15.7.2" resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.7.2.tgz#52c41e75b8c87e72b9d9360e0206b99dcbffa6c5" integrity sha512-8QQikdH7//R2vurIJSutZ1smHYTcLpRWEOlHnzcWHmBYrOGUysKwSsrC89BCiFj3CbrfJ/nXFdJepOVrY1GCHQ== @@ -6844,29 +6830,30 @@ react-emotion@^9.2.6: babel-plugin-emotion "^9.2.11" create-emotion-styled "^9.2.8" -react-is@^16.7.0, react-is@^16.8.1, react-is@^16.8.4, react-is@^16.8.6: - version "16.8.6" - resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.8.6.tgz#5bbc1e2d29141c9fbdfed456343fe2bc430a6a16" - integrity sha512-aUk3bHfZ2bRSVFFbbeVS4i+lNPZr3/WM5jT2J5omUVV1zzcs1nAaf3l51ctA5FFvCRbhrH0bdAsRRQddFJZPtA== - -react-is@^16.9.0: +react-is@^16.6.0, react-is@^16.7.0, react-is@^16.8.1, react-is@^16.8.4, react-is@^16.8.6: version "16.10.2" resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.10.2.tgz#984120fd4d16800e9a738208ab1fba422d23b5ab" integrity sha512-INBT1QEgtcCCgvccr5/86CfD71fw9EPmDxgiJX4I2Ddr6ZsV6iFXsuby+qWJPtmNuMY0zByTsG4468P7nHuNWA== -react-redux@^7.1.1: - version "7.1.1" - resolved "https://registry.yarnpkg.com/react-redux/-/react-redux-7.1.1.tgz#ce6eee1b734a7a76e0788b3309bf78ff6b34fa0a" - integrity sha512-QsW0vcmVVdNQzEkrgzh2W3Ksvr8cqpAv5FhEk7tNEft+5pp7rXxAudTz3VOPawRkLIepItpkEIyLcN/VVXzjTg== +react-lifecycles-compat@^3.0.0: + version "3.0.4" + resolved "https://registry.yarnpkg.com/react-lifecycles-compat/-/react-lifecycles-compat-3.0.4.tgz#4f1a273afdfc8f3488a8c516bfda78f872352362" + integrity sha512-fBASbA6LnOU9dOU2eW7aQ8xmYBSXUIWr+UmF9b1efZBazGNO+rcXT/icdKnYm2pTwcRylVUYwW7H1PHfLekVzA== + +react-redux@^5.0.7: + version "5.1.2" + resolved "https://registry.yarnpkg.com/react-redux/-/react-redux-5.1.2.tgz#b19cf9e21d694422727bf798e934a916c4080f57" + integrity sha512-Ns1G0XXc8hDyH/OcBHOxNgQx9ayH3SPxBnFCOidGKSle8pKihysQw2rG/PmciUQRoclhVBO8HMhiRmGXnDja9Q== dependencies: - "@babel/runtime" "^7.5.5" + "@babel/runtime" "^7.1.2" hoist-non-react-statics "^3.3.0" invariant "^2.2.4" - loose-envify "^1.4.0" - prop-types "^15.7.2" - react-is "^16.9.0" + loose-envify "^1.1.0" + prop-types "^15.6.1" + react-is "^16.6.0" + react-lifecycles-compat "^3.0.0" -react-test-renderer@^16.9.9: +react-test-renderer@^16.11.0: version "16.11.0" resolved "https://registry.yarnpkg.com/react-test-renderer/-/react-test-renderer-16.11.0.tgz#72574566496462c808ac449b0287a4c0a1a7d8f8" integrity sha512-nh9gDl8R4ut+ZNNb2EeKO5VMvTKxwzurbSMuGBoKtjpjbg8JK/u3eVPVNi1h1Ue+eYK9oSzJjb+K3lzLxyA4ag==