From 29ed9602b38baddad575af26af36f363e2d7a1f5 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Mon, 26 Aug 2019 14:53:19 +0000 Subject: [PATCH 1/2] chore(deps): update typescript-eslint monorepo to v2 --- package.json | 4 ++-- yarn.lock | 60 +++++++++++++++++++++++++++++++--------------------- 2 files changed, 38 insertions(+), 26 deletions(-) diff --git a/package.json b/package.json index 89e5047574e..e2d0710fc2b 100644 --- a/package.json +++ b/package.json @@ -44,8 +44,8 @@ "@types/react-dom": "16.9.0", "@types/styled-components": "4.1.18", "@types/webpack": "4.39.1", - "@typescript-eslint/eslint-plugin": "1.13.0", - "@typescript-eslint/parser": "1.13.0", + "@typescript-eslint/eslint-plugin": "2.0.0", + "@typescript-eslint/parser": "2.0.0", "@zendeskgarden/css-bedrock": "7.0.28", "@zendeskgarden/css-variables": "6.3.7", "@zendeskgarden/eslint-config": "8.0.0", diff --git a/yarn.lock b/yarn.lock index 823ff699321..efbd056bc1a 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2515,18 +2515,27 @@ dependencies: "@types/yargs-parser" "*" -"@typescript-eslint/eslint-plugin@1.13.0": - version "1.13.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-1.13.0.tgz#22fed9b16ddfeb402fd7bcde56307820f6ebc49f" - integrity sha512-WQHCozMnuNADiqMtsNzp96FNox5sOVpU8Xt4meaT4em8lOG1SrOv92/mUbEHQVh90sldKSfcOc/I0FOb/14G1g== +"@typescript-eslint/eslint-plugin@2.0.0": + version "2.0.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-2.0.0.tgz#609a5d7b00ce21a6f94d7ef282eba9da57ca1e42" + integrity sha512-Mo45nxTTELODdl7CgpZKJISvLb+Fu64OOO2ZFc2x8sYSnUpFrBUW3H+H/ZGYmEkfnL6VkdtOSxgdt+Av79j0sA== dependencies: - "@typescript-eslint/experimental-utils" "1.13.0" - eslint-utils "^1.3.1" + "@typescript-eslint/experimental-utils" "2.0.0" + eslint-utils "^1.4.0" functional-red-black-tree "^1.0.1" regexpp "^2.0.1" - tsutils "^3.7.0" + tsutils "^3.14.0" -"@typescript-eslint/experimental-utils@1.13.0", "@typescript-eslint/experimental-utils@^1.13.0": +"@typescript-eslint/experimental-utils@2.0.0": + version "2.0.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-2.0.0.tgz#f3d298bb411357f35c4184e24280b256b6321949" + integrity sha512-XGJG6GNBXIEx/mN4eTRypN/EUmsd0VhVGQ1AG+WTgdvjHl0G8vHhVBHrd/5oI6RRYBRnedNymSYWW1HAdivtmg== + dependencies: + "@types/json-schema" "^7.0.3" + "@typescript-eslint/typescript-estree" "2.0.0" + eslint-scope "^4.0.0" + +"@typescript-eslint/experimental-utils@^1.13.0": version "1.13.0" resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-1.13.0.tgz#b08c60d780c0067de2fb44b04b432f540138301e" integrity sha512-zmpS6SyqG4ZF64ffaJ6uah6tWWWgZ8m+c54XXgwFtUv0jNz8aJAVx8chMCvnk7yl6xwn8d+d96+tWp7fXzTuDg== @@ -2535,14 +2544,14 @@ "@typescript-eslint/typescript-estree" "1.13.0" eslint-scope "^4.0.0" -"@typescript-eslint/parser@1.13.0": - version "1.13.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-1.13.0.tgz#61ac7811ea52791c47dc9fd4dd4a184fae9ac355" - integrity sha512-ITMBs52PCPgLb2nGPoeT4iU3HdQZHcPaZVw+7CsFagRJHUhyeTgorEwHXhFf3e7Evzi8oujKNpHc8TONth8AdQ== +"@typescript-eslint/parser@2.0.0": + version "2.0.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-2.0.0.tgz#4273bb19d03489daf8372cdaccbc8042e098178f" + integrity sha512-ibyMBMr0383ZKserIsp67+WnNVoM402HKkxqXGlxEZsXtnGGurbnY90pBO3e0nBUM7chEEOcxUhgw9aPq7fEBA== dependencies: "@types/eslint-visitor-keys" "^1.0.0" - "@typescript-eslint/experimental-utils" "1.13.0" - "@typescript-eslint/typescript-estree" "1.13.0" + "@typescript-eslint/experimental-utils" "2.0.0" + "@typescript-eslint/typescript-estree" "2.0.0" eslint-visitor-keys "^1.0.0" "@typescript-eslint/typescript-estree@1.13.0": @@ -2553,6 +2562,14 @@ lodash.unescape "4.0.1" semver "5.5.0" +"@typescript-eslint/typescript-estree@2.0.0": + version "2.0.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-2.0.0.tgz#c9f6c0efd1b11475540d6a55dc973cc5b9a67e77" + integrity sha512-NXbmzA3vWrSgavymlzMWNecgNOuiMMp62MO3kI7awZRLRcsA1QrYWo6q08m++uuAGVbXH/prZi2y1AWuhSu63w== + dependencies: + lodash.unescape "4.0.1" + semver "^6.2.0" + "@vxna/mini-html-webpack-template@^0.1.7": version "0.1.7" resolved "https://registry.yarnpkg.com/@vxna/mini-html-webpack-template/-/mini-html-webpack-template-0.1.7.tgz#2a8270e513ee14f395cc17c2ce22ced383c45d22" @@ -5976,12 +5993,7 @@ eslint-scope@^5.0.0: esrecurse "^4.1.0" estraverse "^4.1.1" -eslint-utils@^1.3.1: - version "1.3.1" - resolved "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-1.3.1.tgz#9a851ba89ee7c460346f97cf8939c7298827e512" - integrity sha512-Z7YjnIldX+2XMcjr7ZkgEsOj/bREONV60qYeB/bjMAqqqZ4zxKyWX+BOUkdmRmA9riiIPVvo5x86m5elviOk0Q== - -eslint-utils@^1.4.2: +eslint-utils@^1.4.0, eslint-utils@^1.4.2: version "1.4.2" resolved "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-1.4.2.tgz#166a5180ef6ab7eb462f162fd0e6f2463d7309ab" integrity sha512-eAZS2sEUMlIeCjBeubdj45dmBHQwPHWyBcT1VSYB7o9x9WRRqKxyUoiXlRjyAwzN7YEzHJlYg0NmzDRWx6GP4Q== @@ -14456,10 +14468,10 @@ tslib@^1.8.1, tslib@^1.9.0: resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.10.0.tgz#c3c19f95973fb0a62973fb09d90d961ee43e5c8a" integrity sha512-qOebF53frne81cf0S9B41ByenJ3/IuH8yJKngAX35CmiZySA0khhkovshKK+jGCaMnVomla7gVlIcc3EvKPbTQ== -tsutils@^3.7.0: - version "3.14.0" - resolved "https://registry.yarnpkg.com/tsutils/-/tsutils-3.14.0.tgz#bf8d5a7bae5369331fa0f2b0a5a10bd7f7396c77" - integrity sha512-SmzGbB0l+8I0QwsPgjooFRaRvHLBLNYM8SeQ0k6rtNDru5sCGeLJcZdwilNndN+GysuFjF5EIYgN8GfFG6UeUw== +tsutils@^3.14.0: + version "3.17.1" + resolved "https://registry.yarnpkg.com/tsutils/-/tsutils-3.17.1.tgz#ed719917f11ca0dee586272b2ac49e015a2dd759" + integrity sha512-kzeQ5B8H3w60nFY2g8cJIuH7JDpsALXySGtwGJ0p2LSjLgay3NdIpqq5SoOBe46bKDW2iq25irHCr8wjomUS2g== dependencies: tslib "^1.8.1" From f2def7b9397aea3532c958da8635f3761f5a92b1 Mon Sep 17 00:00:00 2001 From: Austin Green Date: Mon, 26 Aug 2019 08:40:51 -0700 Subject: [PATCH 2/2] Ignore single usage of ts-ignore --- packages/datepickers/src/styled/styled-menu.spec.tsx | 1 - packages/dropdowns/src/styled/menu/StyledMenu.spec.tsx | 1 - utils/test/garden-test-utils.tsx | 1 + 3 files changed, 1 insertion(+), 2 deletions(-) diff --git a/packages/datepickers/src/styled/styled-menu.spec.tsx b/packages/datepickers/src/styled/styled-menu.spec.tsx index 6b9ab9735d9..700894f036c 100644 --- a/packages/datepickers/src/styled/styled-menu.spec.tsx +++ b/packages/datepickers/src/styled/styled-menu.spec.tsx @@ -119,7 +119,6 @@ describe('StyledMenuView', () => { Object.keys(arrowClasses).forEach((placement: any) => { const { container } = render(); - // @ts-ignore expect(container.querySelector('ul')).toHaveClass(arrowClasses[placement]); }); }); diff --git a/packages/dropdowns/src/styled/menu/StyledMenu.spec.tsx b/packages/dropdowns/src/styled/menu/StyledMenu.spec.tsx index 8647f0e9405..28d3a124da1 100644 --- a/packages/dropdowns/src/styled/menu/StyledMenu.spec.tsx +++ b/packages/dropdowns/src/styled/menu/StyledMenu.spec.tsx @@ -119,7 +119,6 @@ describe('StyledMenuView', () => { Object.keys(arrowClasses).forEach((placement: any) => { const { container } = render(); - // @ts-ignore expect(container.querySelector('ul')).toHaveClass(arrowClasses[placement]); }); }); diff --git a/utils/test/garden-test-utils.tsx b/utils/test/garden-test-utils.tsx index 1dc7b8e318e..5165d5e35c1 100644 --- a/utils/test/garden-test-utils.tsx +++ b/utils/test/garden-test-utils.tsx @@ -9,6 +9,7 @@ import React from 'react'; import PropTypes from 'prop-types'; import glob from 'glob'; import { render, configure } from '@testing-library/react'; +// eslint-disable-next-line @typescript-eslint/ban-ts-ignore // @ts-ignore import { ThemeProvider } from '../../packages/theming/src';