From 87c22281d01d6aac3b6c2764a4ccee1dbf834873 Mon Sep 17 00:00:00 2001 From: Charles Wahome Date: Mon, 21 Feb 2022 11:18:20 +0300 Subject: [PATCH] Chore: update dependencies (#1476) * Chore(deps): Bump @axe-core/webdriverjs from 4.3.1 to 4.4.0 (#1466) * Chore(deps): Bump redux from 4.0.1 to 4.1.2 (#1404) * Chore(deps-dev): Bump enzyme from 3.9.0 to 3.11.0 (#1406) * Chore(deps): Bump monaco-editor-webpack-plugin from 4.0.0 to 4.2.0 (#1401) * Chore(deps-dev): Bump @types/react-intl from 2.3.17 to 3.0.0 (#1399) * Chore(deps-dev): Bump tslint from 5.12.1 to 5.20.1 (#1397) * Chore(deps-dev): Bump ws from 8.2.3 to 8.5.0 (#1448) * Chore(deps-dev): Bump url-parse from 1.5.3 to 1.5.6 (#1477) Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/linter.yml | 5 +- package-lock.json | 176 +++++++----------- package.json | 16 +- src/app/views/App.tsx | 4 +- .../permissions-action-creators.spec.ts | 1 + tsconfig.json | 3 +- typings.d.ts | 9 + 7 files changed, 89 insertions(+), 125 deletions(-) create mode 100644 typings.d.ts diff --git a/.github/workflows/linter.yml b/.github/workflows/linter.yml index 03ff08cda2..c875a2adfa 100644 --- a/.github/workflows/linter.yml +++ b/.github/workflows/linter.yml @@ -31,13 +31,10 @@ jobs: - name: Run linter run: npm run lint - - name: Run the tests - run: npm test - - name: Build run: npm run build - - name: Generate test coverage report + - name: Run the tests run: npm run test -- --coverage --watchAll=false --testResultsProcessor=jest-sonar-reporter - name: Fix code coverage paths diff --git a/package-lock.json b/package-lock.json index ff13704636..f86e2c8bb3 100644 --- a/package-lock.json +++ b/package-lock.json @@ -19,11 +19,11 @@ "integrity": "sha512-28Y+BPVqjDXsT8AMUXaAxU8U91sgbuw/yHtGjfTzkn+3Qrg4JpOYLp+hkULpLpskZSmwv8CWM7g5Uu6ueYMydA==" }, "@axe-core/webdriverjs": { - "version": "4.3.1", - "resolved": "https://registry.npmjs.org/@axe-core/webdriverjs/-/webdriverjs-4.3.1.tgz", - "integrity": "sha512-FXXWfnrDJwEiKjXgaRaXSxFTZlexQqXX637ElOuhreKN3GVTnHQbzcADqgGjvGF6Wc/GvH+uGtpR0oqVw5Od2w==", + "version": "4.4.0", + "resolved": "https://registry.npmjs.org/@axe-core/webdriverjs/-/webdriverjs-4.4.0.tgz", + "integrity": "sha512-bds2rUNl3mkUBvX+WoLQl7Vm7ctGAS/8Mz/2ADYAUD7Kf7go5ZijyqUynBvAQTtDld1DVQ3HIlo2VTPrNp8pRw==", "requires": { - "axe-core": "^4.3.3" + "axe-core": "^4.4.1" }, "dependencies": { "axe-core": { @@ -3268,10 +3268,13 @@ } }, "@types/react-intl": { - "version": "2.3.17", - "resolved": "https://registry.npmjs.org/@types/react-intl/-/react-intl-2.3.17.tgz", - "integrity": "sha512-FGd6J1GQ7zvl1GZ3BBev83B7nfak8dqoR2PZ+l5MoisKMpd4xOLhZJC1ugpmk3Rz5F85t6HbOg9mYqXW97BsNA==", - "dev": true + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/@types/react-intl/-/react-intl-3.0.0.tgz", + "integrity": "sha512-k8F3d05XQGEqSWIfK97bBjZe4z9RruXU9Wa7OZ2iUC5pdeIpzuQDZe/9C2J3Xir5//ZtAkhcv08Wfx3n5TBTQg==", + "dev": true, + "requires": { + "react-intl": "*" + } }, "@types/react-redux": { "version": "7.1.20", @@ -4374,65 +4377,6 @@ "resolved": "https://registry.npmjs.org/axobject-query/-/axobject-query-2.2.0.tgz", "integrity": "sha512-Td525n+iPOOyUQIeBfcASuG6uJsDOITl7Mds5gFyerkWiX7qhUTdYUBlSgNMyVqtSJqwpt1kXGLdUt6SykLMRA==" }, - "babel-code-frame": { - "version": "6.26.0", - "resolved": "https://registry.npmjs.org/babel-code-frame/-/babel-code-frame-6.26.0.tgz", - "integrity": "sha1-Y/1D99weO7fONZR9uP42mj9Yx0s=", - "dev": true, - "requires": { - "chalk": "^1.1.3", - "esutils": "^2.0.2", - "js-tokens": "^3.0.2" - }, - "dependencies": { - "ansi-regex": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz", - "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=", - "dev": true - }, - "ansi-styles": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz", - "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=", - "dev": true - }, - "chalk": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz", - "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=", - "dev": true, - "requires": { - "ansi-styles": "^2.2.1", - "escape-string-regexp": "^1.0.2", - "has-ansi": "^2.0.0", - "strip-ansi": "^3.0.0", - "supports-color": "^2.0.0" - } - }, - "js-tokens": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-3.0.2.tgz", - "integrity": "sha1-mGbfOVECEw449/mWvOtlRDIJwls=", - "dev": true - }, - "strip-ansi": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz", - "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=", - "dev": true, - "requires": { - "ansi-regex": "^2.0.0" - } - }, - "supports-color": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz", - "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=", - "dev": true - } - } - }, "babel-jest": { "version": "26.6.3", "resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-26.6.3.tgz", @@ -7171,9 +7115,9 @@ } }, "diff": { - "version": "3.5.0", - "resolved": "https://registry.npmjs.org/diff/-/diff-3.5.0.tgz", - "integrity": "sha512-A46qtFgd+g7pDZinpnwiRJtxbC1hpgf0uzP3iG89scHk0AUC7A1TGxf5OiiOUv/JMZR8GOt8hL900hV0bOy5xA==", + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/diff/-/diff-4.0.2.tgz", + "integrity": "sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A==", "dev": true }, "diff-sequences": { @@ -7455,32 +7399,33 @@ "integrity": "sha512-WiyBqoomrwMdFG1e0kqvASYfnlb0lp8M5o5Fw2OFq1hNZxxcNk8Ik0Xm7LxzBhuidnZB/UtBqVCgUz3kBOP51Q==" }, "enzyme": { - "version": "3.9.0", - "resolved": "https://registry.npmjs.org/enzyme/-/enzyme-3.9.0.tgz", - "integrity": "sha512-JqxI2BRFHbmiP7/UFqvsjxTirWoM1HfeaJrmVSZ9a1EADKkZgdPcAuISPMpoUiHlac9J4dYt81MC5BBIrbJGMg==", + "version": "3.11.0", + "resolved": "https://registry.npmjs.org/enzyme/-/enzyme-3.11.0.tgz", + "integrity": "sha512-Dw8/Gs4vRjxY6/6i9wU0V+utmQO9kvh9XLnz3LIudviOnVYDEe2ec+0k+NQoMamn1VrjKgCUOWj5jG/5M5M0Qw==", "dev": true, "requires": { - "array.prototype.flat": "^1.2.1", - "cheerio": "^1.0.0-rc.2", - "function.prototype.name": "^1.1.0", + "array.prototype.flat": "^1.2.3", + "cheerio": "^1.0.0-rc.3", + "enzyme-shallow-equal": "^1.0.1", + "function.prototype.name": "^1.1.2", "has": "^1.0.3", - "html-element-map": "^1.0.0", - "is-boolean-object": "^1.0.0", - "is-callable": "^1.1.4", - "is-number-object": "^1.0.3", - "is-regex": "^1.0.4", - "is-string": "^1.0.4", + "html-element-map": "^1.2.0", + "is-boolean-object": "^1.0.1", + "is-callable": "^1.1.5", + "is-number-object": "^1.0.4", + "is-regex": "^1.0.5", + "is-string": "^1.0.5", "is-subset": "^0.1.1", "lodash.escape": "^4.0.1", "lodash.isequal": "^4.5.0", - "object-inspect": "^1.6.0", - "object-is": "^1.0.1", + "object-inspect": "^1.7.0", + "object-is": "^1.0.2", "object.assign": "^4.1.0", - "object.entries": "^1.0.4", - "object.values": "^1.0.4", - "raf": "^3.4.0", + "object.entries": "^1.1.1", + "object.values": "^1.1.1", + "raf": "^3.4.1", "rst-selector-parser": "^2.2.3", - "string.prototype.trim": "^1.1.2" + "string.prototype.trim": "^1.2.1" } }, "enzyme-adapter-react-16": { @@ -13142,9 +13087,9 @@ "integrity": "sha512-5iylzSJevCnzJn9UVsW8yOZ3yHjmAs4TfvH3zsbftKiFKmHG0xirGN6DK9Kk04VSWxYCZZAIafYJoNJJMAU1KA==" }, "monaco-editor-webpack-plugin": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/monaco-editor-webpack-plugin/-/monaco-editor-webpack-plugin-4.0.0.tgz", - "integrity": "sha512-4BT9XDRQXraMQjxEUjR+uuubRe3RIPkvVoGw8zwWG++s7wq6TAiXaSOMdkdS9TrjCREgSnygCOlVzY6MS8RPuA==", + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/monaco-editor-webpack-plugin/-/monaco-editor-webpack-plugin-4.2.0.tgz", + "integrity": "sha512-/P3sFiEgBl+Y50he4mbknMhbLJVop5gBUZiPS86SuHUDOOnQiQ5rL1jU5lwt1XKAwMEkhwZbUwqaHxTPkb1Utw==", "requires": { "loader-utils": "^2.0.0" }, @@ -15076,12 +15021,21 @@ } }, "redux": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/redux/-/redux-4.0.1.tgz", - "integrity": "sha512-R7bAtSkk7nY6O/OYMVR9RiBI+XghjF9rlbl5806HJbQph0LJVHZrU5oaO4q70eUKiqMRqm4y07KLTlMZ2BlVmg==", + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/redux/-/redux-4.1.2.tgz", + "integrity": "sha512-SH8PglcebESbd/shgf6mii6EIoRM0zrQyjcuQ+ojmfxjTtE0z9Y8pa62iA/OJ58qjP6j27uyW4kUF4jl/jd6sw==", "requires": { - "loose-envify": "^1.4.0", - "symbol-observable": "^1.2.0" + "@babel/runtime": "^7.9.2" + }, + "dependencies": { + "@babel/runtime": { + "version": "7.17.2", + "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.17.2.tgz", + "integrity": "sha512-hzeyJyMA1YGdJTuWU0e/j4wKXrU4OMFvY2MSlaI9B7VQb0r5cxTE3EAIS2Q7Tn2RIcDkRvTA/v2JsAEhxe99uw==", + "requires": { + "regenerator-runtime": "^0.13.4" + } + } } }, "redux-logger": { @@ -16982,7 +16936,8 @@ "symbol-observable": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/symbol-observable/-/symbol-observable-1.2.0.tgz", - "integrity": "sha512-e900nM8RRtGhlV36KGEU9k65K3mPb1WV70OdjfxlG2EAuM1noi/E/BaW/uMhL7bPEssK8QV57vN3esixjUvcXQ==" + "integrity": "sha512-e900nM8RRtGhlV36KGEU9k65K3mPb1WV70OdjfxlG2EAuM1noi/E/BaW/uMhL7bPEssK8QV57vN3esixjUvcXQ==", + "dev": true }, "symbol-tree": { "version": "3.2.4", @@ -17426,23 +17381,24 @@ "integrity": "sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw==" }, "tslint": { - "version": "5.12.1", - "resolved": "https://registry.npmjs.org/tslint/-/tslint-5.12.1.tgz", - "integrity": "sha512-sfodBHOucFg6egff8d1BvuofoOQ/nOeYNfbp7LDlKBcLNrL3lmS5zoiDGyOMdT7YsEXAwWpTdAHwOGOc8eRZAw==", + "version": "5.20.1", + "resolved": "https://registry.npmjs.org/tslint/-/tslint-5.20.1.tgz", + "integrity": "sha512-EcMxhzCFt8k+/UP5r8waCf/lzmeSyVlqxqMEDQE7rWYiQky8KpIBz1JAoYXfROHrPZ1XXd43q8yQnULOLiBRQg==", "dev": true, "requires": { - "babel-code-frame": "^6.22.0", + "@babel/code-frame": "^7.0.0", "builtin-modules": "^1.1.1", "chalk": "^2.3.0", "commander": "^2.12.1", - "diff": "^3.2.0", + "diff": "^4.0.1", "glob": "^7.1.1", - "js-yaml": "^3.7.0", + "js-yaml": "^3.13.1", "minimatch": "^3.0.4", + "mkdirp": "^0.5.1", "resolve": "^1.3.2", "semver": "^5.3.0", "tslib": "^1.8.0", - "tsutils": "^2.27.2" + "tsutils": "^2.29.0" }, "dependencies": { "builtin-modules": { @@ -17770,9 +17726,9 @@ } }, "url-parse": { - "version": "1.5.3", - "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.5.3.tgz", - "integrity": "sha512-IIORyIQD9rvj0A4CLWsHkBBJuNqWpFQe224b6j9t/ABmquIS0qDU2pY6kl6AuOrL5OkCXHMCFNe1jBcuAggjvQ==", + "version": "1.5.6", + "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.5.6.tgz", + "integrity": "sha512-xj3QdUJ1DttD1LeSfvJlU1eiF1RvBSBfUu8GplFGdUzSO28y5yUtEl7wb//PI4Af6qh0o/K8545vUmucRrfWsw==", "dev": true, "requires": { "querystringify": "^2.1.1", @@ -18800,9 +18756,9 @@ } }, "ws": { - "version": "8.2.3", - "resolved": "https://registry.npmjs.org/ws/-/ws-8.2.3.tgz", - "integrity": "sha512-wBuoj1BDpC6ZQ1B7DWQBYVLphPWkm8i9Y0/3YdHjHKHiohOJ1ws+3OccDWtH+PoC9DZD5WOTrJvNbWvjS6JWaA==", + "version": "8.5.0", + "resolved": "https://registry.npmjs.org/ws/-/ws-8.5.0.tgz", + "integrity": "sha512-BWX0SWVgLPzYwF8lTzEy1egjhS4S4OEAHfsO8o65WOVsrnSRGaSiUaa9e0ggGlkMTtBlmOpEXiie9RUcBO86qg==", "dev": true }, "xml": { diff --git a/package.json b/package.json index a7ea544a92..d65cca9788 100644 --- a/package.json +++ b/package.json @@ -4,7 +4,7 @@ "private": true, "dependencies": { "@augloop/types-core": "file:packages/types-core-2.16.189.tgz", - "@axe-core/webdriverjs": "4.3.1", + "@axe-core/webdriverjs": "4.4.0", "@azure/msal-browser": "2.19.0", "@babel/core": "7.16.12", "@babel/eslint-parser": "7.16.3", @@ -51,7 +51,7 @@ "markdown-it": "12.3.2", "mini-css-extract-plugin": "1.6.2", "monaco-editor": "0.25.2", - "monaco-editor-webpack-plugin": "4.0.0", + "monaco-editor-webpack-plugin": "4.2.0", "node-sass": "4.14.1", "pnp-webpack-plugin": "1.7.0", "postcss-flexbugs-fixes": "5.0.2", @@ -64,7 +64,7 @@ "react-dom": "16.8.2", "react-intl": "2.8.0", "react-redux": "7.1.0", - "redux": "4.0.1", + "redux": "4.1.2", "redux-thunk": "2.3.0", "resolve": "1.10.0", "sass-loader": "10.2.1", @@ -112,7 +112,7 @@ "@types/node": "11.9.4", "@types/react": "17.0.35", "@types/react-dom": "17.0.11", - "@types/react-intl": "2.3.17", + "@types/react-intl": "3.0.0", "@types/react-redux": "7.1.20", "@types/redux-logger": "3.0.7", "@types/redux-mock-store": "1.0.0", @@ -129,7 +129,7 @@ "chromedriver": "^88.0.0", "color-string": "1.9.0", "crypto": "1.0.1", - "enzyme": "3.9.0", + "enzyme": "3.11.0", "enzyme-adapter-react-16": "1.15.6", "eslint": "8.7.0", "glob-parent": "6.0.1", @@ -155,11 +155,11 @@ "tar": "6.1.11", "trim-newlines": "4.0.2", "ts-jest": "27.0.7", - "tslint": "5.12.1", + "tslint": "5.20.1", "tslint-config-prettier": "1.18.0", "tslint-react": "4.0.0", - "url-parse": "1.5.3", - "ws": "8.2.3", + "url-parse": "1.5.6", + "ws": "8.5.0", "yargs-parser": "13.1.2" }, "jestSonar": { diff --git a/src/app/views/App.tsx b/src/app/views/App.tsx index 09b872b237..f68427f8b5 100644 --- a/src/app/views/App.tsx +++ b/src/app/views/App.tsx @@ -1,7 +1,7 @@ import { Announced, getTheme, IStackTokens, ITheme, styled } from '@fluentui/react'; import { Resizable } from 're-resizable'; import React, { Component } from 'react'; -import { InjectedIntl, injectIntl } from 'react-intl'; +import { injectIntl } from 'react-intl'; import { connect } from 'react-redux'; import { bindActionCreators, Dispatch } from 'redux'; @@ -43,7 +43,7 @@ import { Sidebar } from './sidebar/Sidebar'; interface IAppProps { theme?: ITheme; styles?: object; - intl: InjectedIntl; + intl: any; profile: object; graphExplorerMode: Mode; sidebarProperties: ISidebarProps; diff --git a/src/tests/services/actions/permissions-action-creators.spec.ts b/src/tests/services/actions/permissions-action-creators.spec.ts index 90a4f73334..94ad3a7bf9 100644 --- a/src/tests/services/actions/permissions-action-creators.spec.ts +++ b/src/tests/services/actions/permissions-action-creators.spec.ts @@ -212,6 +212,7 @@ describe('tests permissions action creators', () => { // Act // @ts-ignore store.dispatch(fetchScopes()) + // @ts-ignore .then((response_: any) => { expect(response_.scopes).toBe(undefined); }) diff --git a/tsconfig.json b/tsconfig.json index cd24ec8cbe..13092def94 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -20,6 +20,7 @@ }, "include": [ "src", - "src/tests" + "src/tests", + "typings.d.ts" ] } diff --git a/typings.d.ts b/typings.d.ts new file mode 100644 index 0000000000..fc7f10da32 --- /dev/null +++ b/typings.d.ts @@ -0,0 +1,9 @@ +declare module 'react-intl'; +declare module 'react-intl/locale-data/zh'; +declare module 'react-intl/locale-data/ja'; +declare module 'react-intl/locale-data/pt'; +declare module 'react-intl/locale-data/ru'; +declare module 'react-intl/locale-data/fr'; +declare module 'react-intl/locale-data/es'; +declare module 'react-intl/locale-data/en'; +declare module 'react-intl/locale-data/de'; \ No newline at end of file