diff --git a/.eslintrc.yml b/.eslintrc.yml index 77718fe3..8cf12746 100644 --- a/.eslintrc.yml +++ b/.eslintrc.yml @@ -97,3 +97,4 @@ rules: '@typescript-eslint/no-untyped-public-signature': off # bugs out on constructors '@typescript-eslint/restrict-template-expressions': off '@typescript-eslint/no-dynamic-delete': off + '@typescript-eslint/prefer-nullish-coalescing': off diff --git a/package.json b/package.json index de867596..25546295 100644 --- a/package.json +++ b/package.json @@ -8,7 +8,7 @@ "@types/js-yaml": "^3.12.1", "@types/node": "12.7.12", "@types/webpack-env": "1.14.1", - "@typescript-eslint/eslint-plugin": "^2.8.0", + "@typescript-eslint/eslint-plugin": "^2.9.0", "@typescript-eslint/parser": "^2.9.0", "apply-loader": "2.0.0", "awesome-typescript-loader": "^5.0.0", @@ -17,10 +17,12 @@ "css-loader": "3.2.0", "electron": "^7.1.2", "electron-builder": "22.1.0", + "electron-download": "^4.1.1", "electron-installer-snap": "^4.1.0", "electron-notarize": "^0.1.1", "electron-rebuild": "^1.8.5", "eslint": "^6.7.1", + "eslint-plugin-import": "^2.18.2", "file-loader": "^4.3.0", "graceful-fs": "^4.2.2", "html-loader": "0.5.5", @@ -50,8 +52,6 @@ "val-loader": "2.0.1", "webpack": "^5.0.0-beta.7", "webpack-cli": "^3.3.10", - "electron-download": "^4.1.1", - "eslint-plugin-import": "^2.18.2", "yaml-loader": "0.5.0" }, "resolutions": { diff --git a/yarn.lock b/yarn.lock index a0f023b3..b4d45df2 100644 --- a/yarn.lock +++ b/yarn.lock @@ -229,26 +229,17 @@ resolved "https://registry.yarnpkg.com/@types/webpack-env/-/webpack-env-1.14.1.tgz#0d8a53f308f017c53a5ddc3d07f4d6fa76b790d7" integrity sha512-0Ki9jAAhKDSuLDXOIMADg54Hu60SuBTEsWaJGGy5cV+SSUQ63J2a+RrYYGrErzz39fXzTibhKrAQJAb8M7PNcA== -"@typescript-eslint/eslint-plugin@^2.8.0": - version "2.8.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-2.8.0.tgz#eca584d46094ebebc3cb3e9fb625bfbc904a534d" - integrity sha512-ohqul5s6XEB0AzPWZCuJF5Fd6qC0b4+l5BGEnrlpmvXxvyymb8yw8Bs4YMF8usNAeuCJK87eFIHy8g8GFvOtGA== +"@typescript-eslint/eslint-plugin@^2.9.0": + version "2.9.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-2.9.0.tgz#fa810282c0e45f6c2310b9c0dfcd25bff97ab7e9" + integrity sha512-98rfOt3NYn5Gr9wekTB8TexxN6oM8ZRvYuphPs1Atfsy419SDLYCaE30aJkRiiTCwGEY98vOhFsEVm7Zs4toQQ== dependencies: - "@typescript-eslint/experimental-utils" "2.8.0" + "@typescript-eslint/experimental-utils" "2.9.0" eslint-utils "^1.4.3" functional-red-black-tree "^1.0.1" regexpp "^3.0.0" tsutils "^3.17.1" -"@typescript-eslint/experimental-utils@2.8.0": - version "2.8.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-2.8.0.tgz#208b4164d175587e9b03ce6fea97d55f19c30ca9" - integrity sha512-jZ05E4SxCbbXseQGXOKf3ESKcsGxT8Ucpkp1jiVp55MGhOvZB2twmWKf894PAuVQTCgbPbJz9ZbRDqtUWzP8xA== - dependencies: - "@types/json-schema" "^7.0.3" - "@typescript-eslint/typescript-estree" "2.8.0" - eslint-scope "^5.0.0" - "@typescript-eslint/experimental-utils@2.9.0": version "2.9.0" resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-2.9.0.tgz#bbe99a8d9510240c055fc4b17230dd0192ba3c7f" @@ -268,19 +259,6 @@ "@typescript-eslint/typescript-estree" "2.9.0" eslint-visitor-keys "^1.1.0" -"@typescript-eslint/typescript-estree@2.8.0": - version "2.8.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-2.8.0.tgz#fcc3fe6532840085d29b75432c8a59895876aeca" - integrity sha512-ksvjBDTdbAQ04cR5JyFSDX113k66FxH1tAXmi+dj6hufsl/G0eMc/f1GgLjEVPkYClDbRKv+rnBFuE5EusomUw== - dependencies: - debug "^4.1.1" - eslint-visitor-keys "^1.1.0" - glob "^7.1.6" - is-glob "^4.0.1" - lodash.unescape "4.0.1" - semver "^6.3.0" - tsutils "^3.17.1" - "@typescript-eslint/typescript-estree@2.9.0": version "2.9.0" resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-2.9.0.tgz#09138daf8f47d0e494ba7db9e77394e928803017"