Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ module.exports = {
ignoreTemplateLiterals: true,
ignoreRegExpLiterals: true,
// Strings longer than 40 symbols (half of standard max-len)
ignorePattern: '"(?=([^"]|\\"){40,}")|\'(?=([^\']|\\\'){40,}\')'
ignorePattern: '"(?=([^"]|"){40,}")|\'(?=([^\']|\'){40,}\')'
}],
quotes: [error, 'single', {avoidEscape: true}],

Expand Down
6 changes: 0 additions & 6 deletions .idea/jsLinters/eslint.xml

This file was deleted.

4 changes: 2 additions & 2 deletions components/error-page-ng/error-page-ng.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ describe('Error Page Ng', () => {
it.skip('should show 403 page on no routing permissions',
inject(($rootScope, $compile, RingMessageBundle, $q, $route) => {
$route.current = {
$$route: { // eslint-disable-line angular/no-private-call
$$route: {// eslint-disable-line angular/no-private-call
permission: 'hub.low-level'
}
};
Expand All @@ -164,7 +164,7 @@ describe('Error Page Ng', () => {
it.skip('should show 403 page on no routing permissions if argument\'s promise is also rejected',
inject(($rootScope, $compile, RingMessageBundle, $q, $route) => {
$route.current = {
$$route: { // eslint-disable-line angular/no-private-call
$$route: {// eslint-disable-line angular/no-private-call
permission: 'hub.low-level'
}
};
Expand Down
1 change: 1 addition & 0 deletions components/icon/.eslintrc.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
/* eslint-disable import/no-commonjs,no-undef */
const {ignore} = require('@jetbrains/eslint-config/consts');

module.exports = {
Expand Down
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@
"devDependencies": {
"@babel/cli": "^7.4.4",
"@babel/polyfill": "^7.4.4",
"@jetbrains/eslint-config": "^4.0.5",
"@jetbrains/eslint-config": "^4.0.6",
"@jetbrains/generator-ring-ui": "^2.0.13",
"@jetbrains/stylelint-config": "^1.3.4",
"@storybook/addon-actions": "^5.1.9",
Expand Down Expand Up @@ -93,7 +93,7 @@
"electron": "^4.1.4",
"enzyme": "^3.10.0",
"enzyme-adapter-react-16": "^1.14.0",
"eslint": "^5.16.0",
"eslint": "^6.0.1",
"eslint-import-resolver-webpack": "^0.11.1",
"glob": "^7.1.4",
"husky": "^2.4.0",
Expand Down
1 change: 0 additions & 1 deletion wallaby.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@ module.exports = wallaby => {

postprocessor: wallabyWebpack(webpackTestConfig),

/* global window */
bootstrap: function bootstrap() {
// required to trigger tests loading
window.__moduleBundler.loadTests();
Expand Down
54 changes: 32 additions & 22 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -1274,21 +1274,21 @@
"@babel/runtime" "^7.4.3"
babel-plugin-angularjs-annotate "^0.9.0"

"@jetbrains/eslint-config@^4.0.5":
version "4.0.5"
resolved "https://registry.yarnpkg.com/@jetbrains/eslint-config/-/eslint-config-4.0.5.tgz#6eeea9f9a5bbc6ad5837f2962472ecb69ba91288"
integrity sha512-+0sClhKpcWgsBBW+cLwj395OI3u1WUvne6fs9IkECLEcuNbB6k6LPjQ2e0e4++D5qKOFiWc+S/ziNPRR4KX9BA==
"@jetbrains/eslint-config@^4.0.6":
version "4.0.6"
resolved "https://registry.yarnpkg.com/@jetbrains/eslint-config/-/eslint-config-4.0.6.tgz#6ef61cd8d97d25a1878a5c1b1e570b1bace8d28c"
integrity sha512-CA2eRYbp+fOeUiByXGo/SpFVhSZC0DrK/GbndOfdng3iHicITgvX6QgbDR7sSvZzhBY9lDF1JmQRTvK5mlKpyw==
dependencies:
eslint-import-resolver-webpack "^0.10.1"
eslint-plugin-angular "3.3.0"
eslint-plugin-bdd "2.1.1"
eslint-plugin-import "^2.13.0"
eslint-plugin-react "7.10.0"

"@jetbrains/generator-ring-ui@^2.0.12":
version "2.0.12"
resolved "https://registry.yarnpkg.com/@jetbrains/generator-ring-ui/-/generator-ring-ui-2.0.12.tgz#ab3ac6ab739f528f60c422144c2a50aeb292a7a0"
integrity sha512-9xQgWinNiyfM0g+XI5n8VKQxQuzrr8aq4glBWRjmig8YkUr14gFcntyvq8JXSO0C+4h85C/Jf/e0lgLO0HXh9g==
"@jetbrains/generator-ring-ui@^2.0.13":
version "2.0.13"
resolved "https://registry.yarnpkg.com/@jetbrains/generator-ring-ui/-/generator-ring-ui-2.0.13.tgz#b74f8429059b8c6e506235811c0cde96fb7a3702"
integrity sha512-qDy8OnI2j4GImFkk9lgld4AcGFjp+dHAswI4be69gpAgev+S2Y8bRb0y7iQEmzRSBHmf8p9Brm8hkoBNYDSqRw==
dependencies:
chalk "^2.4.2"
change-case "^3.1.0"
Expand Down Expand Up @@ -2790,6 +2790,16 @@ ajv@^6.1.0, ajv@^6.5.5, ajv@^6.9.1:
json-schema-traverse "^0.4.1"
uri-js "^4.2.2"

ajv@^6.10.0:
version "6.10.1"
resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.10.1.tgz#ebf8d3af22552df9dd049bfbe50cc2390e823593"
integrity sha512-w1YQaVGNC6t2UCPjEawK/vo/dG8OOrVtUmhBT1uJJYxbl5kU2Tj3v6LGqBcsysN1yhuCStJCCA3GqdvKY8sqXQ==
dependencies:
fast-deep-equal "^2.0.1"
fast-json-stable-stringify "^2.0.0"
json-schema-traverse "^0.4.1"
uri-js "^4.2.2"

amdefine@>=0.0.4:
version "1.0.1"
resolved "https://registry.yarnpkg.com/amdefine/-/amdefine-1.0.1.tgz#4a5282ac164729e93619bcfd3ad151f817ce91f5"
Expand Down Expand Up @@ -5940,40 +5950,40 @@ eslint-visitor-keys@^1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.0.0.tgz#3f3180fb2e291017716acb4c9d6d5b5c34a6a81d"

eslint@^5.16.0:
version "5.16.0"
resolved "https://registry.yarnpkg.com/eslint/-/eslint-5.16.0.tgz#a1e3ac1aae4a3fbd8296fcf8f7ab7314cbb6abea"
integrity sha512-S3Rz11i7c8AA5JPv7xAH+dOyq/Cu/VXHiHXBPOU1k/JAM5dXqQPt3qcrhpHSorXmrpu2g0gkIBVXAqCpzfoZIg==
eslint@^6.0.1:
version "6.0.1"
resolved "https://registry.yarnpkg.com/eslint/-/eslint-6.0.1.tgz#4a32181d72cb999d6f54151df7d337131f81cda7"
integrity sha512-DyQRaMmORQ+JsWShYsSg4OPTjY56u1nCjAmICrE8vLWqyLKxhFXOthwMj1SA8xwfrv0CofLNVnqbfyhwCkaO0w==
dependencies:
"@babel/code-frame" "^7.0.0"
ajv "^6.9.1"
ajv "^6.10.0"
chalk "^2.1.0"
cross-spawn "^6.0.5"
debug "^4.0.1"
doctrine "^3.0.0"
eslint-scope "^4.0.3"
eslint-utils "^1.3.1"
eslint-visitor-keys "^1.0.0"
espree "^5.0.1"
espree "^6.0.0"
esquery "^1.0.1"
esutils "^2.0.2"
file-entry-cache "^5.0.1"
functional-red-black-tree "^1.0.1"
glob "^7.1.2"
glob-parent "^3.1.0"
globals "^11.7.0"
ignore "^4.0.6"
import-fresh "^3.0.0"
imurmurhash "^0.1.4"
inquirer "^6.2.2"
js-yaml "^3.13.0"
is-glob "^4.0.0"
js-yaml "^3.13.1"
json-stable-stringify-without-jsonify "^1.0.1"
levn "^0.3.0"
lodash "^4.17.11"
minimatch "^3.0.4"
mkdirp "^0.5.1"
natural-compare "^1.4.0"
optionator "^0.8.2"
path-is-inside "^1.0.2"
progress "^2.0.0"
regexpp "^2.0.1"
semver "^5.5.1"
Expand All @@ -5982,10 +5992,10 @@ eslint@^5.16.0:
table "^5.2.3"
text-table "^0.2.0"

espree@^5.0.1:
version "5.0.1"
resolved "https://registry.yarnpkg.com/espree/-/espree-5.0.1.tgz#5d6526fa4fc7f0788a5cf75b15f30323e2f81f7a"
integrity sha512-qWAZcWh4XE/RwzLJejfcofscgMc9CamR6Tn1+XRXNzrvUSSbiAjGOI/fggztjIi7y9VLPqnICMIPiGyr8JaZ0A==
espree@^6.0.0:
version "6.0.0"
resolved "https://registry.yarnpkg.com/espree/-/espree-6.0.0.tgz#716fc1f5a245ef5b9a7fdb1d7b0d3f02322e75f6"
integrity sha512-lJvCS6YbCn3ImT3yKkPe0+tJ+mH6ljhGNjHQH9mRtiO6gjhVAOhVXW1yjnwqGwTkK3bGbye+hb00nFNmu0l/1Q==
dependencies:
acorn "^6.0.7"
acorn-jsx "^5.0.0"
Expand Down Expand Up @@ -8337,7 +8347,7 @@ js-tokens@^3.0.2:
version "3.0.2"
resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-3.0.2.tgz#9866df395102130e38f7f996bceb65443209c25b"

[email protected], [email protected], js-yaml@^3.13.0, js-yaml@^3.9.0:
[email protected], [email protected], js-yaml@^3.13.0, js-yaml@^3.13.1, js-yaml@^3.9.0:
version "3.13.1"
resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.13.1.tgz#aff151b30bfdfa8e49e05da22e7415e9dfa37847"
integrity sha512-YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw==
Expand Down