From 9f7f326b94a8cb77f54b3b4d09a3aaf7872aa5e8 Mon Sep 17 00:00:00 2001 From: Zalmoxisus Date: Thu, 3 Jan 2019 17:28:31 +0200 Subject: [PATCH] Update react --- packages/redux-devtools-app/package.json | 17 ++++--- .../src/app/containers/DevTools.js | 3 +- .../redux-devtools-app/test/index.spec.js | 2 +- packages/redux-devtools-app/test/setup.js | 4 ++ yarn.lock | 46 ------------------- 5 files changed, 15 insertions(+), 57 deletions(-) create mode 100644 packages/redux-devtools-app/test/setup.js diff --git a/packages/redux-devtools-app/package.json b/packages/redux-devtools-app/package.json index 547017f9..bc945b69 100644 --- a/packages/redux-devtools-app/package.json +++ b/packages/redux-devtools-app/package.json @@ -20,6 +20,7 @@ "dist" ], "jest": { + "setupTestFrameworkScriptFile": "/test/setup.js", "moduleNameMapper": { "\\.(css|scss)$": "/test/__mocks__/styleMock.js" } @@ -51,8 +52,9 @@ "babel-register": "^6.22.0", "copy-webpack-plugin": "^4.0.1", "css-loader": "^0.26.1", - "enzyme": "^2.8.2", - "enzyme-to-json": "^1.5.1", + "enzyme": "^3.1.0", + "enzyme-adapter-react-16": "^1.0.2", + "enzyme-to-json": "^3.1.4", "eslint": "^3.15.0", "eslint-config-airbnb": "^14.1.0", "eslint-plugin-import": "^2.2.0", @@ -61,13 +63,10 @@ "file-loader": "^0.10.0", "html-loader": "^0.4.4", "html-webpack-plugin": "^2.28.0", - "jest": "^20.0.4", + "jest": "^21.2.1", "raw-loader": "^0.5.1", - "react": "^15.5.4", - "react-addons-test-utils": "15.4.0", - "react-dom": "^15.5.4", - "react-test-renderer": "^15.5.4", - "redux-immutable-state-invariant": "^1.2.0", + "react": "^16.0.0", + "react-dom": "^16.0.0", "redux-logger": "^2.2.1", "rimraf": "^2.5.4", "style-loader": "^0.13.0", @@ -100,6 +99,6 @@ "styled-components": "^2.0.0" }, "peerDependencies": { - "react": "^15.4.0" + "react": "^16.0.0" } } diff --git a/packages/redux-devtools-app/src/app/containers/DevTools.js b/packages/redux-devtools-app/src/app/containers/DevTools.js index 0b9730bf..f0102264 100644 --- a/packages/redux-devtools-app/src/app/containers/DevTools.js +++ b/packages/redux-devtools-app/src/app/containers/DevTools.js @@ -1,4 +1,5 @@ -import React, { Component, PropTypes, createElement } from 'react'; +import React, { Component, createElement } from 'react'; +import PropTypes from 'prop-types'; import { withTheme } from 'styled-components'; import getMonitor from '../utils/getMonitor'; diff --git a/packages/redux-devtools-app/test/index.spec.js b/packages/redux-devtools-app/test/index.spec.js index 43b9fa8e..9a2e2cac 100644 --- a/packages/redux-devtools-app/test/index.spec.js +++ b/packages/redux-devtools-app/test/index.spec.js @@ -36,6 +36,6 @@ describe('App container', () => { const { className } = n.props(); return className && className.startsWith('actionListRows-'); }).html() - ).toMatch(/
<\/div>/); + ).toMatch(/
<\/div>/); }); }); diff --git a/packages/redux-devtools-app/test/setup.js b/packages/redux-devtools-app/test/setup.js new file mode 100644 index 00000000..df7c52bd --- /dev/null +++ b/packages/redux-devtools-app/test/setup.js @@ -0,0 +1,4 @@ +import Enzyme from 'enzyme'; +import Adapter from 'enzyme-adapter-react-16'; + + Enzyme.configure({ adapter: new Adapter() }); diff --git a/yarn.lock b/yarn.lock index 4b9712fa..c4f295b8 100644 --- a/yarn.lock +++ b/yarn.lock @@ -13660,15 +13660,6 @@ react-is@^16.6.1: resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.6.3.tgz#d2d7462fcfcbe6ec0da56ad69047e47e56e7eac0" integrity sha512-u7FDWtthB4rWibG/+mFbVd5FvdI20yde86qKGx4lVUTWmPlSWQ4QxbBIrrs+HnXGbxOUlUzTAP/VDmvCwaP2yA== -react-json-tree@^0.10.7: - version "0.10.9" - resolved "https://registry.yarnpkg.com/react-json-tree/-/react-json-tree-0.10.9.tgz#7263173a2cc8bf05eac63b0419c3ce75b232e284" - integrity sha1-cmMXOizIvwXqxjsEGcPOdbIy4oQ= - dependencies: - babel-runtime "^6.6.1" - prop-types "^15.5.8" - react-base16-styling "^0.5.1" - react-jsonschema-form@^1.0.0: version "1.0.6" resolved "https://registry.yarnpkg.com/react-jsonschema-form/-/react-jsonschema-form-1.0.6.tgz#ceef7c2c386e46a149ec94203547dd9111913e36" @@ -13807,14 +13798,6 @@ react-style-proptype@^3.0.0: dependencies: prop-types "^15.5.4" -react-test-renderer@^15.5.4: - version "15.6.2" - resolved "https://registry.yarnpkg.com/react-test-renderer/-/react-test-renderer-15.6.2.tgz#d0333434fc2c438092696ca770da5ed48037efa8" - integrity sha1-0DM0NPwsQ4CSaWyncNpe1IA376g= - dependencies: - fbjs "^0.8.9" - object-assign "^4.1.0" - react-test-renderer@^16.0.0, react-test-renderer@^16.0.0-0, react-test-renderer@^16.4.0: version "16.7.0" resolved "https://registry.yarnpkg.com/react-test-renderer/-/react-test-renderer-16.7.0.tgz#1ca96c2b450ab47c36ba92cd8c03fcefc52ea01c" @@ -14184,14 +14167,6 @@ redux-devtools-themes@^1.0.0: dependencies: base16 "^1.0.0" -redux-immutable-state-invariant@^1.2.0: - version "1.2.4" - resolved "https://registry.yarnpkg.com/redux-immutable-state-invariant/-/redux-immutable-state-invariant-1.2.4.tgz#e8bc4a37e22815375d5a04f8ecbb807054ea8bbb" - integrity sha1-6LxKN+IoFTddWgT47LuAcFTqi7s= - dependencies: - invariant "^2.1.0" - json-stringify-safe "^5.0.1" - redux-logger@^2.2.1, redux-logger@^2.5.2, redux-logger@^2.8.1: version "2.10.2" resolved "https://registry.yarnpkg.com/redux-logger/-/redux-logger-2.10.2.tgz#3c5a5f0a6f32577c1deadf6655f257f82c6c3937" @@ -14345,27 +14320,6 @@ relateurl@0.2.x: resolved "https://registry.yarnpkg.com/relateurl/-/relateurl-0.2.7.tgz#54dbf377e51440aca90a4cd274600d3ff2d888a9" integrity sha1-VNvzd+UUQKypCkzSdGANP/LYiKk= -remotedev-inspector-monitor@^0.11.0: - version "0.11.0" - resolved "https://registry.yarnpkg.com/remotedev-inspector-monitor/-/remotedev-inspector-monitor-0.11.0.tgz#552dbc3736e6d898a783b51cfd7d20b875620d5f" - integrity sha1-VS28Nzbm2Jing7Uc/X0guHViDV8= - dependencies: - babel-runtime "^6.3.19" - dateformat "^1.0.12" - hex-rgba "^1.0.0" - immutable "^3.7.6" - javascript-stringify "^1.1.0" - jsondiffpatch "^0.2.4" - jss "^6.0.0" - jss-nested "^3.0.0" - jss-vendor-prefixer "^4.0.0" - lodash.debounce "^4.0.3" - react-base16-styling "^0.4.1" - react-dragula "^1.1.17" - react-json-tree "^0.10.7" - react-pure-render "^1.0.2" - redux-devtools-themes "^1.0.0" - remotedev-serialize@^0.1.8: version "0.1.8" resolved "https://registry.yarnpkg.com/remotedev-serialize/-/remotedev-serialize-0.1.8.tgz#c99cb184e7f71a906162abc404be8ce33810205f"