From 1601e6b7c6ff9bd3443464197fb03737704c9e80 Mon Sep 17 00:00:00 2001 From: Luis Deschamps Rudge Date: Wed, 11 Oct 2017 17:33:03 -0300 Subject: [PATCH] Pinning react 15.6.2 --- package.json | 8 +++--- src/__tests__/setup-tests.js | 4 +-- yarn.lock | 49 +++++++++++++++++++++--------------- 3 files changed, 34 insertions(+), 27 deletions(-) diff --git a/package.json b/package.json index 90384a8a0..adba7c4c7 100644 --- a/package.json +++ b/package.json @@ -49,7 +49,7 @@ "css-loader": "^0.26.1", "dotenv": "^4.0.0", "enzyme": "^3.1.0", - "enzyme-adapter-react-16": "^1.0.1", + "enzyme-adapter-react-15": "^1.0.1", "eslint": "^4.8.0", "eslint-config-prettier": "^2.6.0", "eslint-plugin-react": "^7.4.0", @@ -70,7 +70,7 @@ "lint-staged": "^4.2.3", "mochify": "^3.3.0", "prettier": "^1.7.4", - "react-test-renderer": "^16.0.0", + "react-test-renderer": "^15.6.2", "semver": "^5.3.0", "sinon": "^1.15.4", "stylus": "^0.54.5", @@ -94,8 +94,8 @@ "jsonp": "^0.2.0", "password-sheriff": "^1.1.0", "prop-types": "^15.6.0", - "react": "^15.6.1 || ^16.0.0", - "react-dom": "^15.6.1 || ^16.0.0", + "react": "^15.6.2", + "react-dom": "^15.6.2", "react-transition-group": "^2.2.1", "superagent": "^3.3.1", "trim": "0.0.1", diff --git a/src/__tests__/setup-tests.js b/src/__tests__/setup-tests.js index 6e7a0cf4b..a4a92fee3 100644 --- a/src/__tests__/setup-tests.js +++ b/src/__tests__/setup-tests.js @@ -1,8 +1,6 @@ // setup file import { configure } from 'enzyme'; -import Adapter from 'enzyme-adapter-react-16'; - -jest.mock('react-dom/node_modules/fbjs/lib/warning'); +import Adapter from 'enzyme-adapter-react-15'; configure({ adapter: new Adapter() }); diff --git a/yarn.lock b/yarn.lock index 93c67b714..bd8d0ca9a 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2265,6 +2265,14 @@ create-hmac@^1.1.0, create-hmac@^1.1.2: create-hash "^1.1.0" inherits "^2.0.1" +create-react-class@^15.6.0: + version "15.6.2" + resolved "https://registry.yarnpkg.com/create-react-class/-/create-react-class-15.6.2.tgz#cf1ed15f12aad7f14ef5f2dfe05e6c42f91ef02a" + dependencies: + fbjs "^0.8.9" + loose-envify "^1.3.1" + object-assign "^4.1.1" + cross-env@^3.1.4: version "3.2.3" resolved "https://registry.yarnpkg.com/cross-env/-/cross-env-3.2.3.tgz#a43a0799b8ec422d0279b829ce8d7cf2da6b17ac" @@ -2792,9 +2800,9 @@ entities@^1.1.1, entities@~1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/entities/-/entities-1.1.1.tgz#6e5c2d0a5621b5dadaecef80b90edfb5cd7772f0" -enzyme-adapter-react-16@^1.0.1: +enzyme-adapter-react-15@^1.0.1: version "1.0.1" - resolved "https://registry.yarnpkg.com/enzyme-adapter-react-16/-/enzyme-adapter-react-16-1.0.1.tgz#066cb1735e65d8d95841a023f94dab3ce6109e17" + resolved "https://registry.yarnpkg.com/enzyme-adapter-react-15/-/enzyme-adapter-react-15-1.0.1.tgz#c1a3e5966bf1c7221c40aa0f877850175035406f" dependencies: enzyme-adapter-utils "^1.0.0" lodash "^4.17.4" @@ -3237,7 +3245,7 @@ fbjs@^0.3.1: ua-parser-js "^0.7.9" whatwg-fetch "^0.9.0" -fbjs@^0.8.16: +fbjs@^0.8.16, fbjs@^0.8.9: version "0.8.16" resolved "https://registry.yarnpkg.com/fbjs/-/fbjs-0.8.16.tgz#5e67432f550dc41b572bf55847b8aca64e5337db" dependencies: @@ -6869,21 +6877,21 @@ rc@~1.1.6: minimist "^1.2.0" strip-json-comments "~2.0.1" -"react-dom@^15.6.1 || ^16.0.0": - version "16.0.0" - resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-16.0.0.tgz#9cc3079c3dcd70d4c6e01b84aab2a7e34c303f58" +react-dom@^15.6.2: + version "15.6.2" + resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-15.6.2.tgz#41cfadf693b757faf2708443a1d1fd5a02bef730" dependencies: - fbjs "^0.8.16" + fbjs "^0.8.9" loose-envify "^1.1.0" - object-assign "^4.1.1" - prop-types "^15.6.0" + object-assign "^4.1.0" + prop-types "^15.5.10" -react-test-renderer@^16.0.0: - version "16.0.0" - resolved "https://registry.yarnpkg.com/react-test-renderer/-/react-test-renderer-16.0.0.tgz#9fe7b8308f2f71f29fc356d4102086f131c9cb15" +react-test-renderer@^15.6.2: + version "15.6.2" + resolved "https://registry.yarnpkg.com/react-test-renderer/-/react-test-renderer-15.6.2.tgz#d0333434fc2c438092696ca770da5ed48037efa8" dependencies: - fbjs "^0.8.16" - object-assign "^4.1.1" + fbjs "^0.8.9" + object-assign "^4.1.0" react-transition-group@^2.2.1: version "2.2.1" @@ -6896,14 +6904,15 @@ react-transition-group@^2.2.1: prop-types "^15.5.8" warning "^3.0.0" -"react@^15.6.1 || ^16.0.0": - version "16.0.0" - resolved "https://registry.yarnpkg.com/react/-/react-16.0.0.tgz#ce7df8f1941b036f02b2cca9dbd0cb1f0e855e2d" +react@^15.6.2: + version "15.6.2" + resolved "https://registry.yarnpkg.com/react/-/react-15.6.2.tgz#dba0434ab439cfe82f108f0f511663908179aa72" dependencies: - fbjs "^0.8.16" + create-react-class "^15.6.0" + fbjs "^0.8.9" loose-envify "^1.1.0" - object-assign "^4.1.1" - prop-types "^15.6.0" + object-assign "^4.1.0" + prop-types "^15.5.10" read-only-stream@^2.0.0: version "2.0.0"