diff --git a/package.json b/package.json index 2bcd9d4..1d74d8c 100644 --- a/package.json +++ b/package.json @@ -199,7 +199,7 @@ "@typescript-eslint/eslint-plugin": "^2.28.0", "@typescript-eslint/parser": "^2.28.0", "clean-webpack-plugin": "^3.0.0", - "eslint": "^6.8.0", + "eslint": "^7.0.0", "eslint-config-marine": "^6.0.0", "eslint-config-prettier": "^6.10.1", "eslint-plugin-prettier": "^3.1.3", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 8c3accb..b7fe81b 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -6,13 +6,13 @@ dependencies: devDependencies: '@types/node': 13.13.0 '@types/vscode': 1.44.0 - '@typescript-eslint/eslint-plugin': 2.28.0_7d9b020b8616a35b73d4b597f43d4d93 - '@typescript-eslint/parser': 2.28.0_eslint@6.8.0+typescript@3.8.3 + '@typescript-eslint/eslint-plugin': 2.28.0_54d22cf274a7e7ec7a2482f57814e77f + '@typescript-eslint/parser': 2.28.0_eslint@7.0.0+typescript@3.8.3 clean-webpack-plugin: 3.0.0_webpack@4.42.1 - eslint: 6.8.0 - eslint-config-marine: 6.0.0_322d4e82094cc1fdbc64d24bb60ed13d - eslint-config-prettier: 6.10.1_eslint@6.8.0 - eslint-plugin-prettier: 3.1.3_eslint@6.8.0+prettier@2.0.4 + eslint: 7.0.0 + eslint-config-marine: 6.0.0_3373f0dd45407acdc7b35d32567cbf0b + eslint-config-prettier: 6.10.1_eslint@7.0.0 + eslint-plugin-prettier: 3.1.3_eslint@7.0.0+prettier@2.0.4 prettier: 2.0.4 terser-webpack-plugin: 3.0.0_webpack@4.42.1 ts-loader: 7.0.1_typescript@3.8.3 @@ -114,11 +114,11 @@ packages: dev: true resolution: integrity: sha512-BpCtM4NnBen6W+KEhrL9jKuZCXVtiH6+0b6cxdvNt2EwU949Al334PjQSl2BeAyvAX9mgoNNG21wvjP3xZJJ5w== - /@typescript-eslint/eslint-plugin/2.28.0_7d9b020b8616a35b73d4b597f43d4d93: + /@typescript-eslint/eslint-plugin/2.28.0_54d22cf274a7e7ec7a2482f57814e77f: dependencies: - '@typescript-eslint/experimental-utils': 2.28.0_eslint@6.8.0+typescript@3.8.3 - '@typescript-eslint/parser': 2.28.0_eslint@6.8.0+typescript@3.8.3 - eslint: 6.8.0 + '@typescript-eslint/experimental-utils': 2.28.0_eslint@7.0.0+typescript@3.8.3 + '@typescript-eslint/parser': 2.28.0_eslint@7.0.0+typescript@3.8.3 + eslint: 7.0.0 functional-red-black-tree: 1.0.1 regexpp: 3.1.0 tsutils: 3.17.1_typescript@3.8.3 @@ -134,11 +134,11 @@ packages: optional: true resolution: integrity: sha512-w0Ugcq2iatloEabQP56BRWJowliXUP5Wv6f9fKzjJmDW81hOTBxRoJ4LoEOxRpz9gcY51Libytd2ba3yLmSOfg== - /@typescript-eslint/experimental-utils/2.28.0_eslint@6.8.0+typescript@3.8.3: + /@typescript-eslint/experimental-utils/2.28.0_eslint@7.0.0+typescript@3.8.3: dependencies: '@types/json-schema': 7.0.4 '@typescript-eslint/typescript-estree': 2.28.0_typescript@3.8.3 - eslint: 6.8.0 + eslint: 7.0.0 eslint-scope: 5.0.0 eslint-utils: 2.0.0 dev: true @@ -149,12 +149,12 @@ packages: typescript: '*' resolution: integrity: sha512-4SL9OWjvFbHumM/Zh/ZeEjUFxrYKtdCi7At4GyKTbQlrj1HcphIDXlje4Uu4cY+qzszR5NdVin4CCm6AXCjd6w== - /@typescript-eslint/parser/2.28.0_eslint@6.8.0+typescript@3.8.3: + /@typescript-eslint/parser/2.28.0_eslint@7.0.0+typescript@3.8.3: dependencies: '@types/eslint-visitor-keys': 1.0.0 - '@typescript-eslint/experimental-utils': 2.28.0_eslint@6.8.0+typescript@3.8.3 + '@typescript-eslint/experimental-utils': 2.28.0_eslint@7.0.0+typescript@3.8.3 '@typescript-eslint/typescript-estree': 2.28.0_typescript@3.8.3 - eslint: 6.8.0 + eslint: 7.0.0 eslint-visitor-keys: 1.1.0 dev: true engines: @@ -763,6 +763,15 @@ packages: node: '>=8' resolution: integrity: sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg== + /chalk/4.0.0: + dependencies: + ansi-styles: 4.2.1 + supports-color: 7.1.0 + dev: true + engines: + node: '>=10' + resolution: + integrity: sha512-N9oWFcegS0sFr9oh1oz2d7Npos6vNoWW9HvtCg5N1KRFpUhaAhvTv5Y58g880fZaEYSNm3qDz8SU1UrGvp+n7A== /chardet/0.7.0: dev: true resolution: @@ -987,6 +996,16 @@ packages: node: '>=4.8' resolution: integrity: sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ== + /cross-spawn/7.0.2: + dependencies: + path-key: 3.1.1 + shebang-command: 2.0.0 + which: 2.0.2 + dev: true + engines: + node: '>= 8' + resolution: + integrity: sha512-PD6G8QG3S4FK/XCGFbEQrDqO2AnMMsy0meR7lerlIOHAAbkuavGU/pOqprrlvfTNjvowivTeBsjebAL0NSoMxw== /crypto-browserify/3.12.0: dependencies: browserify-cipher: 1.0.1 @@ -1190,11 +1209,11 @@ packages: node: '>=0.8.0' resolution: integrity: sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ= - /eslint-config-aqua/7.2.3_322d4e82094cc1fdbc64d24bb60ed13d: + /eslint-config-aqua/7.2.3_3373f0dd45407acdc7b35d32567cbf0b: dependencies: - eslint: 6.8.0 - eslint-config-prettier: 6.10.1_eslint@6.8.0 - eslint-plugin-prettier: 3.1.3_eslint@6.8.0+prettier@2.0.4 + eslint: 7.0.0 + eslint-config-prettier: 6.10.1_eslint@7.0.0 + eslint-plugin-prettier: 3.1.3_eslint@7.0.0+prettier@2.0.4 prettier: 2.0.4 dev: true engines: @@ -1228,9 +1247,9 @@ packages: optional: true resolution: integrity: sha512-JaUcVFImU6kgF6xmUENyYIiR2c+7BuJd/AH1e9tSPQRLb/owj9KpnDUI6T/xfv3K+dV0sQ0J4mmOqIQC96M43w== - /eslint-config-marine/6.0.0_322d4e82094cc1fdbc64d24bb60ed13d: + /eslint-config-marine/6.0.0_3373f0dd45407acdc7b35d32567cbf0b: dependencies: - eslint-config-aqua: 7.2.3_322d4e82094cc1fdbc64d24bb60ed13d + eslint-config-aqua: 7.2.3_3373f0dd45407acdc7b35d32567cbf0b dev: true peerDependencies: eslint: '*' @@ -1239,9 +1258,9 @@ packages: prettier: '*' resolution: integrity: sha512-4735oFwmfMsXQY/MUKJ/N8EjCqHiLkAu9kbxOjdQCwJpWUeDpGwLUN5LL/c5DZQ/NaQVGfLvUM0gq4waj8UwAA== - /eslint-config-prettier/6.10.1_eslint@6.8.0: + /eslint-config-prettier/6.10.1_eslint@7.0.0: dependencies: - eslint: 6.8.0 + eslint: 7.0.0 get-stdin: 6.0.0 dev: true hasBin: true @@ -1249,9 +1268,9 @@ packages: eslint: '>=3.14.1' resolution: integrity: sha512-svTy6zh1ecQojvpbJSgH3aei/Rt7C6i090l5f2WQ4aB05lYHeZIR1qL4wZyyILTbtmnbHP5Yn8MrsOJMGa8RkQ== - /eslint-plugin-prettier/3.1.3_eslint@6.8.0+prettier@2.0.4: + /eslint-plugin-prettier/3.1.3_eslint@7.0.0+prettier@2.0.4: dependencies: - eslint: 6.8.0 + eslint: 7.0.0 prettier: 2.0.4 prettier-linter-helpers: 1.0.0 dev: true @@ -1280,14 +1299,6 @@ packages: node: '>=8.0.0' resolution: integrity: sha512-oYrhJW7S0bxAFDvWqzvMPRm6pcgcnWc4QnofCAqRTRfQC0JcwenzGglTtsLyIuuWFfkqDG9vz67cnttSd53djw== - /eslint-utils/1.4.3: - dependencies: - eslint-visitor-keys: 1.1.0 - dev: true - engines: - node: '>=6' - resolution: - integrity: sha512-fbBN5W2xdY45KulGXmLHZ3c3FHfVYmKg0IrAKGOkT/464PQsx2UeIzfz1RmEci+KLm1bBaAzZAh8+/E+XAeZ8Q== /eslint-utils/2.0.0: dependencies: eslint-visitor-keys: 1.1.0 @@ -1302,18 +1313,18 @@ packages: node: '>=4' resolution: integrity: sha512-8y9YjtM1JBJU/A9Kc+SbaOV4y29sSWckBwMHa+FGtVj5gN/sbnKDf6xJUl+8g7FAij9LVaP8C24DUiH/f/2Z9A== - /eslint/6.8.0: + /eslint/7.0.0: dependencies: '@babel/code-frame': 7.8.3 ajv: 6.12.2 - chalk: 2.4.2 - cross-spawn: 6.0.5 + chalk: 4.0.0 + cross-spawn: 7.0.2 debug: 4.1.1 doctrine: 3.0.0 eslint-scope: 5.0.0 - eslint-utils: 1.4.3 + eslint-utils: 2.0.0 eslint-visitor-keys: 1.1.0 - espree: 6.2.1 + espree: 7.0.0 esquery: 1.3.1 esutils: 2.0.3 file-entry-cache: 5.0.1 @@ -1327,36 +1338,35 @@ packages: is-glob: 4.0.1 js-yaml: 3.13.1 json-stable-stringify-without-jsonify: 1.0.1 - levn: 0.3.0 + levn: 0.4.1 lodash: 4.17.15 minimatch: 3.0.4 - mkdirp: 0.5.5 natural-compare: 1.4.0 - optionator: 0.8.3 + optionator: 0.9.1 progress: 2.0.3 - regexpp: 2.0.1 - semver: 6.3.0 - strip-ansi: 5.2.0 + regexpp: 3.1.0 + semver: 7.3.2 + strip-ansi: 6.0.0 strip-json-comments: 3.1.0 table: 5.4.6 text-table: 0.2.0 v8-compile-cache: 2.1.0 dev: true engines: - node: ^8.10.0 || ^10.13.0 || >=11.10.1 + node: ^10.12.0 || >=12.0.0 hasBin: true resolution: - integrity: sha512-K+Iayyo2LtyYhDSYwz5D5QdWw0hCacNzyq1Y821Xna2xSJj7cijoLLYmLxTQgcgZ9mC61nryMy9S7GRbYpI5Ig== - /espree/6.2.1: + integrity: sha512-qY1cwdOxMONHJfGqw52UOpZDeqXy8xmD0u8CT6jIstil72jkhURC704W8CFyTPDPllz4z4lu0Ql1+07PG/XdIg== + /espree/7.0.0: dependencies: acorn: 7.1.1 acorn-jsx: 5.2.0_acorn@7.1.1 eslint-visitor-keys: 1.1.0 dev: true engines: - node: '>=6.0.0' + node: ^10.12.0 || >=12.0.0 resolution: - integrity: sha512-ysCxRQY3WaXJz9tdbWOwuWr5Y/XrPTGX9Kiz3yoUXwW0VZ4w30HTkQLaGx/+ttFjF8i+ACbArnB4ce68a9m5hw== + integrity: sha512-/r2XEx5Mw4pgKdyb7GNLQNsu++asx/dltf/CI8RFi9oGHxmQFgvLbc5Op4U6i8Oaj+kdslhJtVlEZeAqH5qOTw== /esprima/4.0.1: dev: true engines: @@ -1966,7 +1976,7 @@ packages: figures: 3.2.0 lodash: 4.17.15 mute-stream: 0.0.8 - run-async: 2.4.0 + run-async: 2.4.1 rxjs: 6.5.5 string-width: 4.2.0 strip-ansi: 6.0.0 @@ -2144,10 +2154,6 @@ packages: node: '>=0.10.0' resolution: integrity: sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og== - /is-promise/2.1.0: - dev: true - resolution: - integrity: sha1-eaKp7OfwlugPNtKy87wWwf9L8/o= /is-stream/1.1.0: dev: true engines: @@ -2264,15 +2270,15 @@ packages: node: '>=6' resolution: integrity: sha512-avPEb8P8EGnwXKClwsNUgryVjllcRqtMYa49NTsbQagYuT1DcXnl1915oxWjoyGrXR6zH/Y0Zc96xWsPcoDKeA== - /levn/0.3.0: + /levn/0.4.1: dependencies: - prelude-ls: 1.1.2 - type-check: 0.3.2 + prelude-ls: 1.2.1 + type-check: 0.4.0 dev: true engines: node: '>= 0.8.0' resolution: - integrity: sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4= + integrity: sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ== /loader-runner/2.4.0: dev: true engines: @@ -2722,19 +2728,19 @@ packages: node: '>=6' resolution: integrity: sha512-5NcSkPHhwTVFIQN+TUqXoS5+dlElHXdpAWu9I0HP20YOtIi+aZ0Ct82jdlILDxjLEAWwvm+qj1m6aEtsDVmm6Q== - /optionator/0.8.3: + /optionator/0.9.1: dependencies: deep-is: 0.1.3 fast-levenshtein: 2.0.6 - levn: 0.3.0 - prelude-ls: 1.1.2 - type-check: 0.3.2 + levn: 0.4.1 + prelude-ls: 1.2.1 + type-check: 0.4.0 word-wrap: 1.2.3 dev: true engines: node: '>= 0.8.0' resolution: - integrity: sha512-+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA== + integrity: sha512-74RlY5FCnhq4jRxVUPKDaRwrVNXMqsGsiW6AJw4XK8hmtm10wC0ypZBLw5IIp85NZMr91+qd1RvvENwg7jjRFw== /os-browserify/0.3.0: dev: true resolution: @@ -2896,6 +2902,12 @@ packages: node: '>=4' resolution: integrity: sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A= + /path-key/3.1.1: + dev: true + engines: + node: '>=8' + resolution: + integrity: sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q== /pbkdf2/3.0.17: dependencies: create-hash: 1.2.0 @@ -2962,12 +2974,12 @@ packages: node: '>=0.10.0' resolution: integrity: sha1-AerA/jta9xoqbAL+q7jB/vfgDqs= - /prelude-ls/1.1.2: + /prelude-ls/1.2.1: dev: true engines: node: '>= 0.8.0' resolution: - integrity: sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ= + integrity: sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g== /prettier-linter-helpers/1.0.0: dependencies: fast-diff: 1.2.0 @@ -3110,12 +3122,6 @@ packages: node: '>=0.10.0' resolution: integrity: sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A== - /regexpp/2.0.1: - dev: true - engines: - node: '>=6.5.0' - resolution: - integrity: sha512-lv0M6+TkDVniA3aD1Eg0DVpfU/booSu7Eev3TDO/mZKHBfVjgCGTV4t4buppESEYDtkArYFOxTJWv6S5C+iaNw== /regexpp/3.1.0: dev: true engines: @@ -3225,14 +3231,12 @@ packages: dev: true resolution: integrity: sha512-ii4iagi25WusVoiC4B4lq7pbXfAp3D9v5CwfkY33vffw2+pkDjY1D8GaN7spsxvCSx8dkPqOZCEZyfxcmJG2IA== - /run-async/2.4.0: - dependencies: - is-promise: 2.1.0 + /run-async/2.4.1: dev: true engines: node: '>=0.12.0' resolution: - integrity: sha512-xJTbh/d7Lm7SBhc1tNvTpeCHaEzoyxPrqNlvSdMfBTYwaY++UJFyXUOxAtsRUXjlqOfj8luNaR9vjCh4KeV+pg== + integrity: sha512-tvVnVv01b8c1RrA6Ep7JkStj85Guv/YrMcwqYQnwjsAS2cTmmPGBBjAjpCW7RrSodNSoE2/qg9O4bceNvUuDgQ== /run-queue/1.0.3: dependencies: aproba: 1.2.0 @@ -3241,7 +3245,7 @@ packages: integrity: sha1-6Eg5bwV9Ij8kOGkkYY4laUFh7Ec= /rxjs/6.5.5: dependencies: - tslib: 1.11.1 + tslib: 1.11.2 dev: true engines: npm: '>=2.0.0' @@ -3294,6 +3298,13 @@ packages: hasBin: true resolution: integrity: sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw== + /semver/7.3.2: + dev: true + engines: + node: '>=10' + hasBin: true + resolution: + integrity: sha512-OrOb32TeeambH6UrhtShmF7CRDqhL6/5XpPNp2DuRH6+9QLw/orhp72j87v8Qa1ScDkvrrBNpZcDejAirJmfXQ== /serialize-javascript/2.1.2: dev: true resolution: @@ -3337,12 +3348,26 @@ packages: node: '>=0.10.0' resolution: integrity: sha1-RKrGW2lbAzmJaMOfNj/uXer98eo= + /shebang-command/2.0.0: + dependencies: + shebang-regex: 3.0.0 + dev: true + engines: + node: '>=8' + resolution: + integrity: sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA== /shebang-regex/1.0.0: dev: true engines: node: '>=0.10.0' resolution: integrity: sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM= + /shebang-regex/3.0.0: + dev: true + engines: + node: '>=8' + resolution: + integrity: sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A== /signal-exit/3.0.3: dev: true resolution: @@ -3761,6 +3786,10 @@ packages: dev: true resolution: integrity: sha512-aZW88SY8kQbU7gpV19lN24LtXh/yD4ZZg6qieAJDDg+YBsJcSmLGK9QpnUjAKVG/xefmvJGd1WUmfpT/g6AJGA== + /tslib/1.11.2: + dev: true + resolution: + integrity: sha512-tTSkux6IGPnUGUd1XAZHcpu85MOkIl5zX49pO+jfsie3eP0B6pyhOlLXm3cAC6T7s+euSDDUUV+Acop5WmtkVg== /tsutils/3.17.1_typescript@3.8.3: dependencies: tslib: 1.11.1 @@ -3776,14 +3805,14 @@ packages: dev: true resolution: integrity: sha1-oVe6QC2iTpv5V/mqadUk7tQpAaY= - /type-check/0.3.2: + /type-check/0.4.0: dependencies: - prelude-ls: 1.1.2 + prelude-ls: 1.2.1 dev: true engines: node: '>= 0.8.0' resolution: - integrity: sha1-WITKtRLPHTVeP7eE8wgEsrUg23I= + integrity: sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew== /type-fest/0.11.0: dev: true engines: @@ -3989,6 +4018,15 @@ packages: hasBin: true resolution: integrity: sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ== + /which/2.0.2: + dependencies: + isexe: 2.0.0 + dev: true + engines: + node: '>= 8' + hasBin: true + resolution: + integrity: sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA== /word-wrap/1.2.3: dev: true engines: @@ -4103,7 +4141,7 @@ specifiers: bufferutil: ^4.0.1 clean-webpack-plugin: ^3.0.0 discord-rpc: discordjs/RPC - eslint: ^6.8.0 + eslint: ^7.0.0 eslint-config-marine: ^6.0.0 eslint-config-prettier: ^6.10.1 eslint-plugin-prettier: ^3.1.3