From: Stas Vilchik Date: Tue, 15 May 2018 11:27:26 +0000 (+0200) Subject: update sonar-web dependencies (#239) X-Git-Tag: 7.5~1182 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=05a73f23b2e922de87d37dc101728c94dfee7648;p=sonarqube.git update sonar-web dependencies (#239) --- diff --git a/server/sonar-web/.flowconfig b/server/sonar-web/.flowconfig index 9913fbfb0b1..10bfeea3cc6 100644 --- a/server/sonar-web/.flowconfig +++ b/server/sonar-web/.flowconfig @@ -1,7 +1,10 @@ [ignore] +/node_modules/@webassemblyjs /node_modules/fbjs.* /node_modules/react-draggable /node_modules/react-side-effect.* +/node_modules/react-virtualized +/node_modules/webassemblyjs /node/.* /.vscode/.* diff --git a/server/sonar-web/config/jest/SetupTestEnvironment.js b/server/sonar-web/config/jest/SetupTestEnvironment.js index 3d6a8825599..20c4396b08f 100644 --- a/server/sonar-web/config/jest/SetupTestEnvironment.js +++ b/server/sonar-web/config/jest/SetupTestEnvironment.js @@ -23,8 +23,6 @@ window.t = window.tp = function() { return args.join('.'); }; -// Fix for https://github.com/facebook/jest/issues/4545 -// Try to remove when jest 21.3.0 is out -window.requestAnimationFrame = function(callback) { - setTimeout(callback, 0); -}; +const content = document.createElement('div'); +content.id = 'content'; +document.documentElement.appendChild(content); diff --git a/server/sonar-web/package.json b/server/sonar-web/package.json index 9f300502e18..aed2f5263af 100644 --- a/server/sonar-web/package.json +++ b/server/sonar-web/package.json @@ -7,76 +7,76 @@ "dependencies": { "babel-polyfill": "6.26.0", "classnames": "2.2.5", - "clipboard": "1.7.1", - "create-react-class": "15.6.2", + "clipboard": "2.0.1", + "create-react-class": "15.6.3", "d3-array": "1.2.1", - "d3-hierarchy": "1.1.5", - "d3-scale": "1.0.6", - "d3-selection": "1.1.0", + "d3-hierarchy": "1.1.6", + "d3-scale": "2.0.0", + "d3-selection": "1.3.0", "d3-shape": "1.2.0", "date-fns": "1.29.0", - "formik": "0.11.7", + "formik": "0.11.11", "gray-matter": "4.0.1", "history": "3.3.0", "intl-relativeformat": "2.1.0", "keymaster": "1.6.2", - "lodash": "4.17.4", - "prop-types": "15.6.0", + "lodash": "4.17.10", + "prop-types": "15.6.1", "react": "16.2.0", - "react-day-picker": "7.1.2", + "react-day-picker": "7.1.8", "react-dom": "16.2.0", - "react-draggable": "3.0.3", + "react-draggable": "3.0.5", "react-helmet": "5.2.0", "react-intl": "2.4.0", - "react-modal": "3.0.4", - "react-redux": "5.0.6", + "react-modal": "3.4.4", + "react-redux": "5.0.7", "react-router": "3.2.0", - "react-select": "1.0.0-rc.10", - "react-virtualized": "9.12.0", + "react-select": "1.2.1", + "react-virtualized": "9.18.5", "redux": "3.7.2", "redux-logger": "3.0.6", "redux-thunk": "2.2.0", - "whatwg-fetch": "2.0.3" + "whatwg-fetch": "2.0.4" }, "devDependencies": { "@types/classnames": "2.2.3", - "@types/clipboard": "1.5.35", + "@types/clipboard": "2.0.0", "@types/d3-array": "1.2.1", - "@types/d3-scale": "1.0.10", - "@types/enzyme": "3.1.6", - "@types/jest": "22.0.1", + "@types/d3-scale": "2.0.0", + "@types/enzyme": "3.1.10", + "@types/jest": "22.2.3", "@types/keymaster": "1.6.28", - "@types/lodash": "4.14.102", + "@types/lodash": "4.14.108", "@types/prop-types": "15.5.2", "@types/react": "16.0.29", "@types/react-dom": "16.0.3", - "@types/react-helmet": "5.0.3", - "@types/react-intl": "2.3.2", - "@types/react-modal": "2.2.2", + "@types/react-helmet": "5.0.6", + "@types/react-intl": "2.3.8", + "@types/react-modal": "3.1.2", "@types/react-redux": "5.0.12", "@types/react-router": "3.0.13", - "@types/react-select": "1.0.59", - "@types/react-virtualized": "9.7.15", - "autoprefixer": "7.1.6", - "babel-core": "6.26.0", - "babel-jest": "22.0.6", + "@types/react-select": "1.2.6", + "@types/react-virtualized": "9.18.3", + "autoprefixer": "8.4.1", + "babel-core": "6.26.3", + "babel-jest": "22.4.3", "babel-loader": "7.1.4", - "babel-plugin-dynamic-import-node": "1.1.0", + "babel-plugin-dynamic-import-node": "1.2.0", "babel-plugin-syntax-dynamic-import": "6.18.0", "babel-plugin-transform-class-properties": "^6.22.0", "babel-plugin-transform-object-rest-spread": "6.26.0", "babel-plugin-transform-react-constant-elements": "^6.22.0", "babel-plugin-transform-react-jsx-self": "^6.22.0", "babel-plugin-transform-react-jsx-source": "^6.22.0", - "babel-preset-env": "1.6.1", + "babel-preset-env": "1.7.0", "babel-preset-react": "^6.22.0", - "chalk": "2.3.0", + "chalk": "2.4.1", "clean-webpack-plugin": "0.1.19", "copy-webpack-plugin": "4.5.1", "css-loader": "0.28.11", "enzyme": "3.3.0", "enzyme-adapter-react-16": "1.1.1", - "enzyme-to-json": "3.3.0", + "enzyme-to-json": "3.3.3", "escape-string-regexp": "1.0.5", "eslint": "4.19.1", "eslint-config-sonarqube": "0.1.0", @@ -89,28 +89,28 @@ "flow-bin": "^0.52.0", "glob": "7.1.2", "glob-promise": "3.4.0", - "html-webpack-plugin": "3.0.6", - "jest": "22.0.6", + "html-webpack-plugin": "3.2.0", + "jest": "22.4.3", "lint-staged": "4.3.0", - "mini-css-extract-plugin": "0.2.0", + "mini-css-extract-plugin": "0.4.0", "postcss-calc": "6.0.1", "postcss-custom-properties": "6.2.0", - "postcss-loader": "2.1.1", + "postcss-loader": "2.1.5", "prettier": "1.11.1", "raw-loader": "0.5.1", - "react-dev-utils": "5.0.0", + "react-dev-utils": "5.0.1", "react-error-overlay": "1.0.7", "react-test-renderer": "16.2.0", "remark": "9.0.0", - "remark-react": "4.0.1", - "style-loader": "0.20.3", - "ts-jest": "22.0.1", - "ts-loader": "4.1.0", + "remark-react": "4.0.3", + "style-loader": "0.21.0", + "ts-jest": "22.4.5", + "ts-loader": "4.3.0", "typescript": "2.8.3", "typescript-eslint-parser": "15.0.0", - "webpack": "4.1.1", - "webpack-bundle-analyzer": "2.11.1", - "webpack-dev-server": "3.1.1" + "webpack": "4.8.1", + "webpack-bundle-analyzer": "2.11.2", + "webpack-dev-server": "3.1.4" }, "scripts": { "start": "node scripts/start.js", @@ -138,7 +138,6 @@ "jest": { "coverageDirectory": "/target/coverage", "coveragePathIgnorePatterns": ["/node_modules", "/tests"], - "mapCoverage": true, "moduleFileExtensions": ["ts", "tsx", "js", "json"], "moduleNameMapper": { "^.+\\.(jpg|jpeg|png|gif|eot|otf|webp|svg|ttf|woff|woff2|mp4|webm|wav|mp3|m4a|aac|oga)$": diff --git a/server/sonar-web/src/main/js/apps/account/notifications/Projects.tsx b/server/sonar-web/src/main/js/apps/account/notifications/Projects.tsx index 77f7876bb7d..87534d86b24 100644 --- a/server/sonar-web/src/main/js/apps/account/notifications/Projects.tsx +++ b/server/sonar-web/src/main/js/apps/account/notifications/Projects.tsx @@ -136,7 +136,6 @@ export default class Projects extends React.PureComponent { cache={false} className="input-super-large" loadOptions={this.loadOptions} - minimumInput={2} name="new_project" onChange={this.handleAddProject} optionRenderer={this.renderOption} diff --git a/server/sonar-web/src/main/js/apps/account/notifications/__tests__/__snapshots__/Projects-test.tsx.snap b/server/sonar-web/src/main/js/apps/account/notifications/__tests__/__snapshots__/Projects-test.tsx.snap index 74aceb01f8f..72fd77b67c3 100644 --- a/server/sonar-web/src/main/js/apps/account/notifications/__tests__/__snapshots__/Projects-test.tsx.snap +++ b/server/sonar-web/src/main/js/apps/account/notifications/__tests__/__snapshots__/Projects-test.tsx.snap @@ -103,7 +103,6 @@ exports[`should render projects 1`] = ` cache={false} className="input-super-large" loadOptions={[Function]} - minimumInput={2} name="new_project" onChange={[Function]} optionRenderer={[Function]} @@ -230,7 +229,6 @@ exports[`should render projects 2`] = ` cache={false} className="input-super-large" loadOptions={[Function]} - minimumInput={2} name="new_project" onChange={[Function]} optionRenderer={[Function]} @@ -357,7 +355,6 @@ exports[`should render projects 3`] = ` cache={false} className="input-super-large" loadOptions={[Function]} - minimumInput={2} name="new_project" onChange={[Function]} optionRenderer={[Function]} diff --git a/server/sonar-web/src/main/js/apps/background-tasks/components/__tests__/ScannerContext-test.tsx b/server/sonar-web/src/main/js/apps/background-tasks/components/__tests__/ScannerContext-test.tsx index d8a429a5388..12bd9297176 100644 --- a/server/sonar-web/src/main/js/apps/background-tasks/components/__tests__/ScannerContext-test.tsx +++ b/server/sonar-web/src/main/js/apps/background-tasks/components/__tests__/ScannerContext-test.tsx @@ -19,7 +19,7 @@ */ /* eslint-disable import/order */ import * as React from 'react'; -import { mount, shallow } from 'enzyme'; +import { shallow } from 'enzyme'; import ScannerContext from '../ScannerContext'; import { click } from '../../../../helpers/testUtils'; @@ -57,7 +57,7 @@ it('closes', () => { }); it('fetches scanner context on mount', async () => { - const wrapper = mount(); + const wrapper = shallow(); expect(wrapper.state()).toEqual({}); expect(getTask).toBeCalledWith('123', ['scannerContext']); await new Promise(setImmediate); diff --git a/server/sonar-web/src/main/js/apps/background-tasks/components/__tests__/Stacktrace-test.tsx b/server/sonar-web/src/main/js/apps/background-tasks/components/__tests__/Stacktrace-test.tsx index 3c43f3cc49d..8b8a8af5e1d 100644 --- a/server/sonar-web/src/main/js/apps/background-tasks/components/__tests__/Stacktrace-test.tsx +++ b/server/sonar-web/src/main/js/apps/background-tasks/components/__tests__/Stacktrace-test.tsx @@ -19,7 +19,7 @@ */ /* eslint-disable import/order */ import * as React from 'react'; -import { mount, shallow } from 'enzyme'; +import { shallow } from 'enzyme'; import Stacktrace from '../Stacktrace'; import { click } from '../../../../helpers/testUtils'; @@ -57,7 +57,7 @@ it('closes', () => { }); it('fetches scanner context on mount', async () => { - const wrapper = mount(); + const wrapper = shallow(); expect(wrapper.state()).toEqual({ loading: true }); expect(getTask).toBeCalledWith('123', ['stacktrace']); await new Promise(setImmediate); diff --git a/server/sonar-web/src/main/js/apps/component-measures/drilldown/TreeMapView.js b/server/sonar-web/src/main/js/apps/component-measures/drilldown/TreeMapView.js index 5dac90f6fc7..62d23b385b4 100644 --- a/server/sonar-web/src/main/js/apps/component-measures/drilldown/TreeMapView.js +++ b/server/sonar-web/src/main/js/apps/component-measures/drilldown/TreeMapView.js @@ -19,6 +19,7 @@ */ // @flow import React from 'react'; +// $FlowFixMe import AutoSizer from 'react-virtualized/dist/commonjs/AutoSizer'; import { scaleLinear, scaleOrdinal } from 'd3-scale'; import EmptyResult from './EmptyResult'; diff --git a/server/sonar-web/src/main/js/apps/custom-measures/components/Form.tsx b/server/sonar-web/src/main/js/apps/custom-measures/components/Form.tsx index 3f584725f8a..2ceb90694d8 100644 --- a/server/sonar-web/src/main/js/apps/custom-measures/components/Form.tsx +++ b/server/sonar-web/src/main/js/apps/custom-measures/components/Form.tsx @@ -123,7 +123,7 @@ export default class Form extends React.PureComponent { ) : ( diff --git a/server/sonar-web/src/main/js/apps/quality-gates/components/Condition.tsx b/server/sonar-web/src/main/js/apps/quality-gates/components/Condition.tsx index e12692f12e3..11a644c4692 100644 --- a/server/sonar-web/src/main/js/apps/quality-gates/components/Condition.tsx +++ b/server/sonar-web/src/main/js/apps/quality-gates/components/Condition.tsx @@ -177,7 +177,7 @@ export default class Condition extends React.PureComponent { return (
-