diff --git a/UNRELEASED.md b/UNRELEASED.md index 5c68e1f7cfa..19c2b004794 100644 --- a/UNRELEASED.md +++ b/UNRELEASED.md @@ -32,6 +32,7 @@ Use [the changelog guidelines](/documentation/Versioning%20and%20changelog.md) t - Tightened up what absolute imports are allowed. Removed `baseUrl` from `tsconfig.json`. Attempting to do an absolute import from `src/X` or `components/X` now results in a error when type-checking. ([#4643](https://github.com/Shopify/polaris-react/pull/4643)) - Remove analyze custom properties check. ([#4718](https://github.com/Shopify/polaris-react/pull/4718)) +- Removed support for importing from `components` as it slows tests down ([#4735](https://github.com/Shopify/polaris-react/pull/4735)) ### Dependency upgrades diff --git a/loom.config.ts b/loom.config.ts index c8aae8beda5..23f5e5ef76f 100644 --- a/loom.config.ts +++ b/loom.config.ts @@ -55,7 +55,6 @@ function jestAdjustmentsPlugin() { configuration.jestModuleNameMapper?.hook((moduleNameMapper) => ({ ...moduleNameMapper, '^tests/(.*)': '/tests/$1', - '^components$': '/src/components', })); // Ignore tests in the examples folder diff --git a/src/components/AccountConnection/tests/AccountConnection.test.tsx b/src/components/AccountConnection/tests/AccountConnection.test.tsx index 02472aca08a..3258a5c60ad 100644 --- a/src/components/AccountConnection/tests/AccountConnection.test.tsx +++ b/src/components/AccountConnection/tests/AccountConnection.test.tsx @@ -1,7 +1,7 @@ import React from 'react'; import {mountWithApp} from 'tests/utilities'; -import {Avatar} from 'components'; +import {Avatar} from '../../Avatar'; import {Button} from '../../Button'; import {AccountConnection} from '../AccountConnection'; diff --git a/src/components/ActionList/components/Item/tests/Item.test.tsx b/src/components/ActionList/components/Item/tests/Item.test.tsx index d0408e67103..533a91bafb9 100644 --- a/src/components/ActionList/components/Item/tests/Item.test.tsx +++ b/src/components/ActionList/components/Item/tests/Item.test.tsx @@ -1,9 +1,9 @@ import React from 'react'; import {mountWithApp} from 'tests/utilities'; -import {UnstyledLink} from 'components'; import {Item} from '../Item'; import {TextStyle} from '../../../../TextStyle'; +import {UnstyledLink} from '../../../../UnstyledLink'; describe('', () => { it('adds a style property when the image prop is present', () => { diff --git a/src/components/ActionMenu/components/MenuGroup/tests/MenuGroup.test.tsx b/src/components/ActionMenu/components/MenuGroup/tests/MenuGroup.test.tsx index e8f0ae884c0..63f0130df73 100644 --- a/src/components/ActionMenu/components/MenuGroup/tests/MenuGroup.test.tsx +++ b/src/components/ActionMenu/components/MenuGroup/tests/MenuGroup.test.tsx @@ -1,7 +1,9 @@ import React from 'react'; import {mountWithApp} from 'tests/utilities'; -import {Popover, ActionList, Button} from 'components'; +import {ActionList} from '../../../../ActionList'; +import {Button} from '../../../../Button'; +import {Popover} from '../../../../Popover'; import {MenuGroup} from '../MenuGroup'; describe('', () => { diff --git a/src/components/ActionMenu/components/RollupActions/tests/RollupActions.test.tsx b/src/components/ActionMenu/components/RollupActions/tests/RollupActions.test.tsx index 19d1941d40f..5979230dcdc 100644 --- a/src/components/ActionMenu/components/RollupActions/tests/RollupActions.test.tsx +++ b/src/components/ActionMenu/components/RollupActions/tests/RollupActions.test.tsx @@ -1,8 +1,9 @@ import React from 'react'; import {HorizontalDotsMinor} from '@shopify/polaris-icons'; import {mountWithApp} from 'tests/utilities'; -import {Button, Popover} from 'components'; +import {Button} from '../../../../Button'; +import {Popover} from '../../../../Popover'; // eslint-disable-next-line @shopify/strict-component-boundaries import { Item as ActionListItem, diff --git a/src/components/Autocomplete/tests/Autocomplete.test.tsx b/src/components/Autocomplete/tests/Autocomplete.test.tsx index fdacef15fc6..42b81b325ea 100644 --- a/src/components/Autocomplete/tests/Autocomplete.test.tsx +++ b/src/components/Autocomplete/tests/Autocomplete.test.tsx @@ -1,6 +1,5 @@ import React from 'react'; import {mountWithApp, ReactTestingElement, CustomRoot} from 'tests/utilities'; -import {KeypressListener} from 'components'; import {TextField} from '../../TextField'; import {Key, SectionDescriptor} from '../../../types'; @@ -9,6 +8,7 @@ import {ComboboxTextFieldContext} from '../../../utilities/combobox'; import {Autocomplete} from '../Autocomplete'; import {Combobox} from '../../Combobox'; import type {ComboboxProps} from '../../Combobox'; +import {KeypressListener} from '../../KeypressListener'; import {Listbox} from '../../Listbox'; describe('', () => { diff --git a/src/components/Avatar/tests/Avatar-ssr.test.tsx b/src/components/Avatar/tests/Avatar-ssr.test.tsx index cc8b28f5192..08404ff39de 100644 --- a/src/components/Avatar/tests/Avatar-ssr.test.tsx +++ b/src/components/Avatar/tests/Avatar-ssr.test.tsx @@ -1,6 +1,8 @@ import React from 'react'; import {mountWithApp} from 'tests/utilities'; -import {Avatar, Image} from 'components'; + +import {Image} from '../../Image'; +import {Avatar} from '../Avatar'; jest.mock('../../../utilities/use-is-after-initial-mount', () => { return { diff --git a/src/components/Avatar/tests/Avatar.test.tsx b/src/components/Avatar/tests/Avatar.test.tsx index 565d46663ad..dbbe3e0cce8 100644 --- a/src/components/Avatar/tests/Avatar.test.tsx +++ b/src/components/Avatar/tests/Avatar.test.tsx @@ -1,6 +1,8 @@ import React from 'react'; import {mountWithApp} from 'tests/utilities'; -import {Avatar, Image} from 'components'; + +import {Image} from '../../Image'; +import {Avatar} from '../Avatar'; describe('', () => { describe('intials', () => { diff --git a/src/components/Badge/tests/Badge.test.tsx b/src/components/Badge/tests/Badge.test.tsx index f73c6f6d65e..89c69f5b35c 100644 --- a/src/components/Badge/tests/Badge.test.tsx +++ b/src/components/Badge/tests/Badge.test.tsx @@ -1,7 +1,7 @@ import React from 'react'; import {mountWithApp} from 'tests/utilities'; -import {VisuallyHidden} from 'components'; +import {VisuallyHidden} from '../../VisuallyHidden'; import {Badge} from '../Badge'; describe('', () => { diff --git a/src/components/Banner/tests/Banner.test.tsx b/src/components/Banner/tests/Banner.test.tsx index 12422cc35de..66abeb48fe7 100644 --- a/src/components/Banner/tests/Banner.test.tsx +++ b/src/components/Banner/tests/Banner.test.tsx @@ -7,15 +7,13 @@ import { DiamondAlertMajor, } from '@shopify/polaris-icons'; import {mountWithApp} from 'tests/utilities'; -import { - Button, - Heading, - Icon, - Spinner, - UnstyledButton, - UnstyledLink, -} from 'components'; +import {Button} from '../../Button'; +import {Heading} from '../../Heading'; +import {Icon} from '../../Icon'; +import {Spinner} from '../../Spinner'; +import {UnstyledButton} from '../../UnstyledButton'; +import {UnstyledLink} from '../../UnstyledLink'; import {BannerContext} from '../../../utilities/banner-context'; import {WithinContentContext} from '../../../utilities/within-content-context'; import {Banner, BannerHandles} from '../Banner'; diff --git a/src/components/BulkActions/components/BulkActionMenu/tests/BulkActionMenu.test.tsx b/src/components/BulkActions/components/BulkActionMenu/tests/BulkActionMenu.test.tsx index 9be42eb390c..3e25e6dfe8f 100644 --- a/src/components/BulkActions/components/BulkActionMenu/tests/BulkActionMenu.test.tsx +++ b/src/components/BulkActions/components/BulkActionMenu/tests/BulkActionMenu.test.tsx @@ -1,7 +1,8 @@ import React from 'react'; -import {Popover, ActionList} from 'components'; import {mountWithApp} from 'tests/utilities'; +import {ActionList} from '../../../../ActionList'; +import {Popover} from '../../../../Popover'; import {BulkActionMenu, BulkActionsMenuProps, BulkActionButton} from '../..'; const defaultProps: BulkActionsMenuProps = { diff --git a/src/components/BulkActions/tests/BulkActions.test.tsx b/src/components/BulkActions/tests/BulkActions.test.tsx index c23f916263a..362d48470ec 100644 --- a/src/components/BulkActions/tests/BulkActions.test.tsx +++ b/src/components/BulkActions/tests/BulkActions.test.tsx @@ -1,10 +1,11 @@ import React from 'react'; import {Transition, CSSTransition} from 'react-transition-group'; import {mountWithApp} from 'tests/utilities'; -import {Popover, ActionList} from 'components'; +import {ActionList} from '../../ActionList'; import {CheckableButton} from '../../CheckableButton'; import {Button} from '../../Button'; +import {Popover} from '../../Popover'; import { BulkActionButton, BulkActionMenu, diff --git a/src/components/Button/tests/Button.test.tsx b/src/components/Button/tests/Button.test.tsx index 6e09dc753d9..8f3fa20f66e 100644 --- a/src/components/Button/tests/Button.test.tsx +++ b/src/components/Button/tests/Button.test.tsx @@ -6,8 +6,12 @@ import { SelectMinor, } from '@shopify/polaris-icons'; import {mountWithApp} from 'tests/utilities'; -import {ActionList, Icon, Popover, Spinner, UnstyledButton} from 'components'; +import {ActionList} from '../../ActionList'; +import {Icon} from '../../Icon'; +import {Popover} from '../../Popover'; +import {Spinner} from '../../Spinner'; +import {UnstyledButton} from '../../UnstyledButton'; import {Button} from '../Button'; import en from '../../../../locales/en.json'; import styles from '../Button.scss'; diff --git a/src/components/ButtonGroup/components/Item/tests/Item.test.tsx b/src/components/ButtonGroup/components/Item/tests/Item.test.tsx index 5a090df73d1..cd608c31736 100644 --- a/src/components/ButtonGroup/components/Item/tests/Item.test.tsx +++ b/src/components/ButtonGroup/components/Item/tests/Item.test.tsx @@ -1,7 +1,7 @@ import React from 'react'; import {mountWithApp} from 'tests/utilities'; -import {Button} from 'components'; +import {Button} from '../../../../Button'; import {Item} from '../Item'; describe('', () => { diff --git a/src/components/ButtonGroup/tests/ButtonGroup.test.tsx b/src/components/ButtonGroup/tests/ButtonGroup.test.tsx index 54c4b0e2c56..3d7e13fe71c 100644 --- a/src/components/ButtonGroup/tests/ButtonGroup.test.tsx +++ b/src/components/ButtonGroup/tests/ButtonGroup.test.tsx @@ -1,7 +1,7 @@ import React from 'react'; import {mountWithApp} from 'tests/utilities'; -import {Button} from 'components'; +import {Button} from '../../Button'; import {Item} from '../components'; import {ButtonGroup} from '../ButtonGroup'; diff --git a/src/components/CalloutCard/tests/CalloutCard.test.tsx b/src/components/CalloutCard/tests/CalloutCard.test.tsx index 758800d1a1f..cbb0f5cf395 100644 --- a/src/components/CalloutCard/tests/CalloutCard.test.tsx +++ b/src/components/CalloutCard/tests/CalloutCard.test.tsx @@ -1,7 +1,8 @@ import React from 'react'; import {mountWithApp} from 'tests/utilities'; -import {Button, ButtonGroup} from 'components'; +import {Button} from '../../Button'; +import {ButtonGroup} from '../../ButtonGroup'; import {CalloutCard} from '../CalloutCard'; describe('', () => { diff --git a/src/components/Card/components/Header/tests/Header.test.tsx b/src/components/Card/components/Header/tests/Header.test.tsx index bf9514aea29..a786f9ba102 100644 --- a/src/components/Card/components/Header/tests/Header.test.tsx +++ b/src/components/Card/components/Header/tests/Header.test.tsx @@ -1,7 +1,9 @@ import React from 'react'; import {mountWithApp} from 'tests/utilities'; -import {ButtonGroup, Heading, buttonsFrom} from 'components'; +import {buttonsFrom} from '../../../../Button'; +import {ButtonGroup} from '../../../../ButtonGroup'; +import {Heading} from '../../../../Heading'; import {Header} from '../Header'; jest.mock('../../../../Button', () => ({ diff --git a/src/components/Card/components/Section/tests/Section.test.tsx b/src/components/Card/components/Section/tests/Section.test.tsx index cc280860d47..897d2719da9 100644 --- a/src/components/Card/components/Section/tests/Section.test.tsx +++ b/src/components/Card/components/Section/tests/Section.test.tsx @@ -1,7 +1,10 @@ import React from 'react'; import {mountWithApp} from 'tests/utilities'; -import {Badge, Subheading, ButtonGroup, Button} from 'components'; +import {Badge} from '../../../../Badge'; +import {Button} from '../../../../Button'; +import {ButtonGroup} from '../../../../ButtonGroup'; +import {Subheading} from '../../../../Subheading'; import {Section} from '../Section'; describe('', () => { diff --git a/src/components/Card/tests/Card.test.tsx b/src/components/Card/tests/Card.test.tsx index c82cb4c96bd..cba986c00e6 100644 --- a/src/components/Card/tests/Card.test.tsx +++ b/src/components/Card/tests/Card.test.tsx @@ -1,8 +1,12 @@ import React from 'react'; import {mountWithApp} from 'tests/utilities'; -import {Card, Badge, Button, Popover, ActionList} from 'components'; +import {Badge} from '../../Badge'; +import {Button} from '../../Button'; +import {Popover} from '../../Popover'; +import {ActionList} from '../../ActionList'; import {WithinContentContext} from '../../../utilities/within-content-context'; +import {Card} from '../Card'; import {Section} from '../components'; describe('', () => { diff --git a/src/components/CheckableButton/tests/CheckableButton.test.tsx b/src/components/CheckableButton/tests/CheckableButton.test.tsx index 95b71aa1abc..b9b2f0bd393 100644 --- a/src/components/CheckableButton/tests/CheckableButton.test.tsx +++ b/src/components/CheckableButton/tests/CheckableButton.test.tsx @@ -1,7 +1,7 @@ import React from 'react'; import {mountWithApp} from 'tests/utilities'; -import {Checkbox} from 'components'; +import {Checkbox} from '../../Checkbox'; import {CheckableButton} from '../CheckableButton'; const CheckableButtonProps = { diff --git a/src/components/Choice/tests/Choice.test.tsx b/src/components/Choice/tests/Choice.test.tsx index 13f25887d02..5c108f0e9d7 100644 --- a/src/components/Choice/tests/Choice.test.tsx +++ b/src/components/Choice/tests/Choice.test.tsx @@ -1,7 +1,7 @@ import React from 'react'; import {mountWithApp} from 'tests/utilities'; -import {InlineError} from 'components'; +import {InlineError} from '../../InlineError'; import {Choice} from '../Choice'; describe('', () => { diff --git a/src/components/ChoiceList/tests/ChoiceList.test.tsx b/src/components/ChoiceList/tests/ChoiceList.test.tsx index afd30baa95d..475879f40b2 100644 --- a/src/components/ChoiceList/tests/ChoiceList.test.tsx +++ b/src/components/ChoiceList/tests/ChoiceList.test.tsx @@ -1,7 +1,9 @@ import React from 'react'; import {mountWithApp} from 'tests/utilities'; -import {RadioButton, Checkbox, InlineError} from 'components'; +import {Checkbox} from '../../Checkbox'; +import {InlineError} from '../../InlineError'; +import {RadioButton} from '../../RadioButton'; import {ChoiceList, ChoiceListProps} from '../ChoiceList'; describe('', () => { diff --git a/src/components/DataTable/components/Cell/tests/Cell.test.tsx b/src/components/DataTable/components/Cell/tests/Cell.test.tsx index 2e1083f887c..b550b25946a 100644 --- a/src/components/DataTable/components/Cell/tests/Cell.test.tsx +++ b/src/components/DataTable/components/Cell/tests/Cell.test.tsx @@ -2,7 +2,7 @@ import React, {ReactElement} from 'react'; import {CaretUpMinor, CaretDownMinor} from '@shopify/polaris-icons'; import {mountWithApp} from 'tests/utilities'; -import {Icon} from '../../../..'; +import {Icon} from '../../../../Icon'; import {Cell} from '../Cell'; describe('', () => { diff --git a/src/components/DataTable/components/Navigation/tests/Navigation.test.tsx b/src/components/DataTable/components/Navigation/tests/Navigation.test.tsx index e492143c8b4..d3a153d5606 100644 --- a/src/components/DataTable/components/Navigation/tests/Navigation.test.tsx +++ b/src/components/DataTable/components/Navigation/tests/Navigation.test.tsx @@ -1,7 +1,7 @@ import React from 'react'; import {mountWithApp} from 'tests/utilities'; -import {Button} from 'components'; +import {Button} from '../../../../Button'; import {Navigation} from '../Navigation'; describe('', () => { diff --git a/src/components/DataTable/tests/DataTable.test.tsx b/src/components/DataTable/tests/DataTable.test.tsx index 92ceef24ad5..678754626da 100644 --- a/src/components/DataTable/tests/DataTable.test.tsx +++ b/src/components/DataTable/tests/DataTable.test.tsx @@ -1,8 +1,8 @@ import React from 'react'; import {timer} from '@shopify/jest-dom-mocks'; import {mountWithApp} from 'tests/utilities'; -import {Checkbox} from 'components'; +import {Checkbox} from '../../Checkbox'; import {Cell, Navigation} from '../components'; import {DataTable, DataTableProps} from '../DataTable'; diff --git a/src/components/DropZone/components/FileUpload/tests/FileUpload.test.tsx b/src/components/DropZone/components/FileUpload/tests/FileUpload.test.tsx index ffdf56b30cd..ad2c4a525ba 100755 --- a/src/components/DropZone/components/FileUpload/tests/FileUpload.test.tsx +++ b/src/components/DropZone/components/FileUpload/tests/FileUpload.test.tsx @@ -1,7 +1,8 @@ import React from 'react'; -import {Caption, TextStyle} from 'components'; import {mountWithApp} from 'tests/utilities'; +import {Caption} from '../../../../Caption'; +import {TextStyle} from '../../../../TextStyle'; import {DropZoneContext} from '../../../context'; import {FileUpload} from '../FileUpload'; import {uploadArrow as uploadArrowImage} from '../../../images'; diff --git a/src/components/DropZone/tests/DropZone.test.tsx b/src/components/DropZone/tests/DropZone.test.tsx index dbea231dffc..6a8338594cc 100755 --- a/src/components/DropZone/tests/DropZone.test.tsx +++ b/src/components/DropZone/tests/DropZone.test.tsx @@ -1,10 +1,12 @@ import React from 'react'; import {act} from 'react-dom/test-utils'; import {clock} from '@shopify/jest-dom-mocks'; -import {Label, Labelled, TextStyle, Caption} from 'components'; -import {mountWithApp} from 'tests/utilities'; -import type {CustomRoot} from '@shopify/react-testing'; +import {mountWithApp, CustomRoot} from 'tests/utilities'; +import {Caption} from '../../Caption'; +import {Label} from '../../Label'; +import {Labelled} from '../../Labelled'; +import {TextStyle} from '../../TextStyle'; import {DropZone, DropZoneFileType} from '../DropZone'; import {DropZoneContext} from '../context'; diff --git a/src/components/EmptySearchResult/tests/EmptySearchResult.test.tsx b/src/components/EmptySearchResult/tests/EmptySearchResult.test.tsx index a2e3d2e40f5..dcd61e3fd36 100644 --- a/src/components/EmptySearchResult/tests/EmptySearchResult.test.tsx +++ b/src/components/EmptySearchResult/tests/EmptySearchResult.test.tsx @@ -1,7 +1,8 @@ import React from 'react'; import {mountWithApp} from 'tests/utilities'; -import {DisplayText, TextStyle} from 'components'; +import {DisplayText} from '../../DisplayText'; +import {TextStyle} from '../../TextStyle'; import {EmptySearchResult} from '../EmptySearchResult'; import {emptySearch} from '../illustrations'; diff --git a/src/components/EmptyState/tests/EmptyState.test.tsx b/src/components/EmptyState/tests/EmptyState.test.tsx index 4f3d9970ca1..ebef6787f64 100644 --- a/src/components/EmptyState/tests/EmptyState.test.tsx +++ b/src/components/EmptyState/tests/EmptyState.test.tsx @@ -1,14 +1,12 @@ import React from 'react'; import {mountWithApp} from 'tests/utilities'; -import { - Button, - DisplayText, - Image, - Stack, - TextContainer, - UnstyledLink, -} from 'components'; +import {Button} from '../../Button'; +import {DisplayText} from '../../DisplayText'; +import {Image} from '../../Image'; +import {Stack} from '../../Stack'; +import {TextContainer} from '../../TextContainer'; +import {UnstyledLink} from '../../UnstyledLink'; import {WithinContentContext} from '../../../utilities/within-content-context'; import {EmptyState} from '../EmptyState'; diff --git a/src/components/ExceptionList/tests/ExceptionList.test.tsx b/src/components/ExceptionList/tests/ExceptionList.test.tsx index 81a45b6d932..e565006c37f 100644 --- a/src/components/ExceptionList/tests/ExceptionList.test.tsx +++ b/src/components/ExceptionList/tests/ExceptionList.test.tsx @@ -1,9 +1,9 @@ import React from 'react'; import {CirclePlusMinor, NoteMinor} from '@shopify/polaris-icons'; import {mountWithApp} from 'tests/utilities'; -import {Icon} from 'components'; import {ExceptionList} from '../ExceptionList'; +import {Icon} from '../../Icon'; import {Truncate} from '../../Truncate'; describe('', () => { diff --git a/src/components/Filters/components/ConnectedFilterControl/tests/ConnectedFilterControl.test.tsx b/src/components/Filters/components/ConnectedFilterControl/tests/ConnectedFilterControl.test.tsx index 64b36ab33c7..9c0c043a320 100644 --- a/src/components/Filters/components/ConnectedFilterControl/tests/ConnectedFilterControl.test.tsx +++ b/src/components/Filters/components/ConnectedFilterControl/tests/ConnectedFilterControl.test.tsx @@ -1,7 +1,8 @@ import React from 'react'; -import {Popover, Button} from 'components'; import {mountWithApp} from 'tests/utilities'; +import {Button} from '../../../../Button'; +import {Popover} from '../../../../Popover'; import styles from '../ConnectedFilterControl.scss'; import { ConnectedFilterControl, diff --git a/src/components/Filters/tests/Filters.test.tsx b/src/components/Filters/tests/Filters.test.tsx index 6476fe8ad41..469a4ead50d 100644 --- a/src/components/Filters/tests/Filters.test.tsx +++ b/src/components/Filters/tests/Filters.test.tsx @@ -1,20 +1,18 @@ import React from 'react'; import {matchMedia} from '@shopify/jest-dom-mocks'; -import { - Button, - Popover, - Sheet, - Tag, - TextField, - TextStyle, - ButtonProps, -} from 'components'; import {mountWithApp} from 'tests/utilities'; +import {Button, ButtonProps} from '../../Button'; +import {Collapsible} from '../../Collapsible'; +import {Popover} from '../../Popover'; +// eslint-disable-next-line import/no-deprecated +import {Sheet} from '../../Sheet'; +import {Tag} from '../../Tag'; +import {TextField} from '../../TextField'; +import {TextStyle} from '../../TextStyle'; import {WithinFilterContext} from '../../../utilities/within-filter-context'; import {Filters, FiltersProps} from '../Filters'; import {ConnectedFilterControl, TagsWrapper} from '../components'; -import {Collapsible} from '../../Collapsible'; import * as focusUtils from '../../../utilities/focus'; import styles from '../Filters.scss'; @@ -101,6 +99,8 @@ describe('', () => { .find(Button, {children: 'More filters'})! .trigger('onClick'); jest.runAllTimers(); + + // eslint-disable-next-line import/no-deprecated expect(resourceFilters).toContainReactComponent(Sheet, {open: true}); }); @@ -114,6 +114,7 @@ describe('', () => { .find(Button, {children: 'More filters'})! .trigger('onClick'); + // eslint-disable-next-line import/no-deprecated expect(resourceFilters).toContainReactComponent(Sheet, {open: false}); }); @@ -121,6 +122,7 @@ describe('', () => { it('renders a sheet on desktop size with right origin', () => { const resourceFilters = mountWithApp(); + // eslint-disable-next-line import/no-deprecated expect(resourceFilters).toContainReactComponent(Sheet); }); @@ -128,6 +130,7 @@ describe('', () => { matchMedia.setMedia(() => ({matches: true})); const resourceFilters = mountWithApp(); + // eslint-disable-next-line import/no-deprecated expect(resourceFilters).toContainReactComponent(Sheet); }); @@ -139,6 +142,7 @@ describe('', () => { .find(Button, {children: 'More filters'})! .trigger('onClick'); + // eslint-disable-next-line import/no-deprecated expect(resourceFilters).toContainReactComponent(Sheet, {open: true}); }); @@ -153,6 +157,7 @@ describe('', () => { .find(Button, {children: 'More filters'})! .trigger('onClick'); + // eslint-disable-next-line import/no-deprecated expect(resourceFilters).toContainReactComponent(Sheet, {open: false}); }); }); diff --git a/src/components/FooterHelp/tests/FooterHelp.test.tsx b/src/components/FooterHelp/tests/FooterHelp.test.tsx index 5f389823bdb..0e385a1b28a 100644 --- a/src/components/FooterHelp/tests/FooterHelp.test.tsx +++ b/src/components/FooterHelp/tests/FooterHelp.test.tsx @@ -1,8 +1,8 @@ import React from 'react'; import {InfoMinor} from '@shopify/polaris-icons'; import {mountWithApp} from 'tests/utilities'; -import {Icon} from 'components'; +import {Icon} from '../../Icon'; import {FooterHelp} from '../FooterHelp'; describe('', () => { diff --git a/src/components/FormLayout/components/Group/tests/Group.test.tsx b/src/components/FormLayout/components/Group/tests/Group.test.tsx index 4ec4e99d27f..6961cb501b2 100644 --- a/src/components/FormLayout/components/Group/tests/Group.test.tsx +++ b/src/components/FormLayout/components/Group/tests/Group.test.tsx @@ -1,7 +1,7 @@ import React from 'react'; -import {TextField} from 'components'; import {mountWithApp} from 'tests/utilities'; +import {TextField} from '../../../../TextField'; import {Group} from '../Group'; describe('', () => { diff --git a/src/components/FormLayout/components/Item/tests/Item.test.tsx b/src/components/FormLayout/components/Item/tests/Item.test.tsx index 3d0a066a246..f0f78937eee 100644 --- a/src/components/FormLayout/components/Item/tests/Item.test.tsx +++ b/src/components/FormLayout/components/Item/tests/Item.test.tsx @@ -1,7 +1,7 @@ import React from 'react'; import {mountWithApp} from 'tests/utilities'; -import {TextField} from 'components'; +import {TextField} from '../../../../TextField'; import {Item} from '../Item'; describe('', () => { diff --git a/src/components/FormLayout/tests/FormLayout.test.tsx b/src/components/FormLayout/tests/FormLayout.test.tsx index b74cd9db69a..b36d06d9f46 100644 --- a/src/components/FormLayout/tests/FormLayout.test.tsx +++ b/src/components/FormLayout/tests/FormLayout.test.tsx @@ -1,7 +1,7 @@ import React from 'react'; -import {TextField} from 'components'; import {mountWithApp} from 'tests/utilities'; +import {TextField} from '../../TextField'; import {FormLayout} from '../FormLayout'; describe('', () => { diff --git a/src/components/Frame/components/ContextualSaveBar/components/DiscardConfirmationModal/tests/DiscardConfirmationModal.test.tsx b/src/components/Frame/components/ContextualSaveBar/components/DiscardConfirmationModal/tests/DiscardConfirmationModal.test.tsx index d9f1a2bf684..c8b60925d9e 100644 --- a/src/components/Frame/components/ContextualSaveBar/components/DiscardConfirmationModal/tests/DiscardConfirmationModal.test.tsx +++ b/src/components/Frame/components/ContextualSaveBar/components/DiscardConfirmationModal/tests/DiscardConfirmationModal.test.tsx @@ -1,7 +1,7 @@ import React from 'react'; import {mountWithApp} from 'tests/utilities'; -import {Modal} from 'components'; +import {Modal} from '../../../../../../Modal'; import {DiscardConfirmationModal} from '../DiscardConfirmationModal'; describe('', () => { diff --git a/src/components/Frame/components/ContextualSaveBar/tests/ContextualSaveBar.test.tsx b/src/components/Frame/components/ContextualSaveBar/tests/ContextualSaveBar.test.tsx index 18362747858..d639d3b81b1 100644 --- a/src/components/Frame/components/ContextualSaveBar/tests/ContextualSaveBar.test.tsx +++ b/src/components/Frame/components/ContextualSaveBar/tests/ContextualSaveBar.test.tsx @@ -1,7 +1,9 @@ import React from 'react'; -import {Button, Image, ThemeProvider} from 'components'; import {mountWithApp} from 'tests/utilities'; +import {Button} from '../../../../Button'; +import {Image} from '../../../../Image'; +import {ThemeProvider} from '../../../../ThemeProvider'; import {ContextualSaveBar} from '../ContextualSaveBar'; import {DiscardConfirmationModal} from '../components'; diff --git a/src/components/Frame/tests/Frame.test.tsx b/src/components/Frame/tests/Frame.test.tsx index fdc8c04d801..0798e2b93c4 100644 --- a/src/components/Frame/tests/Frame.test.tsx +++ b/src/components/Frame/tests/Frame.test.tsx @@ -2,12 +2,10 @@ import React, {createRef} from 'react'; import {CSSTransition} from 'react-transition-group'; import {animationFrame, dimension} from '@shopify/jest-dom-mocks'; import {mountWithApp} from 'tests/utilities'; -import { - ContextualSaveBar as PolarisContextualSavebar, - Loading as PolarisLoading, - TrapFocus, -} from 'components'; +import {ContextualSaveBar as PolarisContextualSavebar} from '../../ContextualSaveBar'; +import {Loading as PolarisLoading} from '../../Loading'; +import {TrapFocus} from '../../TrapFocus'; import {Frame} from '../Frame'; import { ContextualSaveBar as FrameContextualSavebar, diff --git a/src/components/Labelled/tests/Labelled.test.tsx b/src/components/Labelled/tests/Labelled.test.tsx index dca304c0c7e..e4d28273bef 100644 --- a/src/components/Labelled/tests/Labelled.test.tsx +++ b/src/components/Labelled/tests/Labelled.test.tsx @@ -1,8 +1,10 @@ import React from 'react'; -import {InlineError, Label, Labelled} from 'components'; import {mountWithApp} from 'tests/utilities'; import {Button} from '../../Button'; +import {InlineError} from '../../InlineError'; +import {Label} from '../../Label'; +import {Labelled} from '..'; describe('', () => { it('passes relevant props along to the label', () => { diff --git a/src/components/Link/tests/Link.test.tsx b/src/components/Link/tests/Link.test.tsx index d103be8c58f..0a4591ae600 100644 --- a/src/components/Link/tests/Link.test.tsx +++ b/src/components/Link/tests/Link.test.tsx @@ -1,7 +1,9 @@ import React from 'react'; import {mountWithApp} from 'tests/utilities'; -import {Banner, UnstyledLink, Icon} from 'components'; +import {Banner} from '../../Banner'; +import {UnstyledLink} from '../../UnstyledLink'; +import {Icon} from '../../Icon'; import en from '../../../../locales/en.json'; import {Link} from '../Link'; diff --git a/src/components/Listbox/components/Option/tests/Option.test.tsx b/src/components/Listbox/components/Option/tests/Option.test.tsx index 2afc9330771..946f4a188a7 100644 --- a/src/components/Listbox/components/Option/tests/Option.test.tsx +++ b/src/components/Listbox/components/Option/tests/Option.test.tsx @@ -8,13 +8,6 @@ import {TextOption} from '../../TextOption'; import {MappedActionContext} from '../../../../../utilities/autocomplete'; import {UnstyledLink} from '../../../../UnstyledLink'; -jest.mock('components', () => ({ - ...jest.requireActual('components'), - Icon() { - return null; - }, -})); - const defaultProps = { accessibilityLabel: 'label', value: 'value', diff --git a/src/components/Listbox/components/TextOption/tests/TextOption.test.tsx b/src/components/Listbox/components/TextOption/tests/TextOption.test.tsx index db323cdab2c..8e8a8136c19 100644 --- a/src/components/Listbox/components/TextOption/tests/TextOption.test.tsx +++ b/src/components/Listbox/components/TextOption/tests/TextOption.test.tsx @@ -5,13 +5,6 @@ import {TextOption} from '../TextOption'; import {Checkbox} from '../../../../Checkbox'; import {ComboboxListboxOptionContext} from '../../../../../utilities/combobox/context'; -jest.mock('components', () => ({ - ...jest.requireActual('components'), - Icon() { - return null; - }, -})); - describe('TextOption', () => { it('renders children', () => { const child = 'child'; diff --git a/src/components/MediaCard/tests/MediaCard.test.tsx b/src/components/MediaCard/tests/MediaCard.test.tsx index 6515467184f..2565f64bb20 100644 --- a/src/components/MediaCard/tests/MediaCard.test.tsx +++ b/src/components/MediaCard/tests/MediaCard.test.tsx @@ -1,7 +1,11 @@ import React from 'react'; -import {Heading, Popover, Button, ActionList, Badge} from 'components'; import {mountWithApp} from 'tests/utilities'; +import {Heading} from '../../Heading'; +import {Popover} from '../../Popover'; +import {Button} from '../../Button'; +import {ActionList} from '../../ActionList'; +import {Badge} from '../../Badge'; import {MediaCard} from '../MediaCard'; import styles from '../MediaCard.scss'; diff --git a/src/components/MediaQueryProvider/tests/MediaQueryProvider.test.tsx b/src/components/MediaQueryProvider/tests/MediaQueryProvider.test.tsx index a812db5ba5d..1a5a2e3fd42 100644 --- a/src/components/MediaQueryProvider/tests/MediaQueryProvider.test.tsx +++ b/src/components/MediaQueryProvider/tests/MediaQueryProvider.test.tsx @@ -2,8 +2,8 @@ import React from 'react'; import {matchMedia} from '@shopify/jest-dom-mocks'; import {act} from 'react-dom/test-utils'; import {mountWithApp} from 'tests/utilities'; -import {EventListener} from 'components'; +import {EventListener} from '../../EventListener'; import {MediaQueryProvider} from '../MediaQueryProvider'; import {useMediaQuery} from '../../../utilities/media-query'; diff --git a/src/components/Modal/components/Dialog/tests/Dialog.test.tsx b/src/components/Modal/components/Dialog/tests/Dialog.test.tsx index c5322b7ef6e..04a6233ba0b 100644 --- a/src/components/Modal/components/Dialog/tests/Dialog.test.tsx +++ b/src/components/Modal/components/Dialog/tests/Dialog.test.tsx @@ -1,8 +1,8 @@ import React from 'react'; import {animationFrame} from '@shopify/jest-dom-mocks'; import {mountWithApp} from 'tests/utilities'; -import {KeypressListener} from 'components'; +import {KeypressListener} from '../../../../KeypressListener'; import {Dialog} from '../Dialog'; describe('', () => { diff --git a/src/components/Modal/tests/Modal.test.tsx b/src/components/Modal/tests/Modal.test.tsx index 0bc982a0b88..f48c6c444a2 100644 --- a/src/components/Modal/tests/Modal.test.tsx +++ b/src/components/Modal/tests/Modal.test.tsx @@ -1,8 +1,12 @@ import React, {useRef} from 'react'; import {animationFrame} from '@shopify/jest-dom-mocks'; import {mountWithApp} from 'tests/utilities'; -import {Badge, Button, Spinner, Portal, Scrollable} from 'components'; +import {Badge} from '../../Badge'; +import {Button} from '../../Button'; +import {Scrollable} from '../../Scrollable'; +import {Spinner} from '../../Spinner'; +import {Portal} from '../../Portal'; import {Footer, Dialog, Header} from '../components'; import {Modal} from '../Modal'; import {WithinContentContext} from '../../../utilities/within-content-context'; diff --git a/src/components/Navigation/components/Item/tests/Item.test.tsx b/src/components/Navigation/components/Item/tests/Item.test.tsx index 098c27075fe..e281db77cde 100644 --- a/src/components/Navigation/components/Item/tests/Item.test.tsx +++ b/src/components/Navigation/components/Item/tests/Item.test.tsx @@ -1,9 +1,12 @@ import React from 'react'; import {PlusMinor, ExternalMinor} from '@shopify/polaris-icons'; import {matchMedia} from '@shopify/jest-dom-mocks'; -import {Icon, UnstyledLink, Indicator, Badge} from 'components'; import {mountWithApp} from 'tests/utilities'; +import {Badge} from '../../../../Badge'; +import {Icon} from '../../../../Icon'; +import {Indicator} from '../../../../Indicator'; +import {UnstyledLink} from '../../../../UnstyledLink'; import {NavigationContext} from '../../../context'; import {Item, ItemProps} from '../Item'; import {Secondary} from '../components'; diff --git a/src/components/Page/components/Header/components/Title/tests/Title.test.tsx b/src/components/Page/components/Header/components/Title/tests/Title.test.tsx index 877a26f2c0a..ad8448106e4 100644 --- a/src/components/Page/components/Header/components/Title/tests/Title.test.tsx +++ b/src/components/Page/components/Header/components/Title/tests/Title.test.tsx @@ -1,7 +1,9 @@ import React from 'react'; import {mountWithApp} from 'tests/utilities'; -import {Badge, DisplayText, Avatar} from 'components'; +import {Badge} from '../../../../../../Badge'; +import {DisplayText} from '../../../../../../DisplayText'; +import {Avatar} from '../../../../../../Avatar'; import {Title} from '../Title'; describe('', () => { diff --git a/src/components/Page/components/Header/tests/Header.test.tsx b/src/components/Page/components/Header/tests/Header.test.tsx index 279437cee6a..99ba9e8f195 100644 --- a/src/components/Page/components/Header/tests/Header.test.tsx +++ b/src/components/Page/components/Header/tests/Header.test.tsx @@ -1,16 +1,14 @@ import React from 'react'; import {PlusMinor} from '@shopify/polaris-icons'; -import { - ActionMenu, - Breadcrumbs, - Pagination, - Badge, - Avatar, - Button, - ButtonGroup, -} from 'components'; import {mountWithApp} from 'tests/utilities'; +import {Avatar} from '../../../../Avatar'; +import {ActionMenu} from '../../../../ActionMenu'; +import {Badge} from '../../../../Badge'; +import {Breadcrumbs} from '../../../../Breadcrumbs'; +import {Button} from '../../../../Button'; +import {ButtonGroup} from '../../../../ButtonGroup'; +import {Pagination} from '../../../../Pagination'; import type {LinkAction} from '../../../../../types'; import {Header, HeaderProps} from '../Header'; diff --git a/src/components/Page/tests/Page.test.tsx b/src/components/Page/tests/Page.test.tsx index df2977e7c71..1472d524bd8 100644 --- a/src/components/Page/tests/Page.test.tsx +++ b/src/components/Page/tests/Page.test.tsx @@ -1,15 +1,12 @@ import React, {useCallback, useState} from 'react'; import {animationFrame} from '@shopify/jest-dom-mocks'; -import { - Page, - PageProps, - Card, - Avatar, - Badge, - ActionMenuProps, -} from 'components'; import {mountWithApp} from 'tests/utilities'; +import {Avatar} from '../../Avatar'; +import type {ActionMenuProps} from '../../ActionMenu'; +import {Badge} from '../../Badge'; +import {Card} from '../../Card'; +import {Page, PageProps} from '../Page'; import {Header} from '../components'; window.matchMedia = diff --git a/src/components/Pagination/tests/Pagination.test.tsx b/src/components/Pagination/tests/Pagination.test.tsx index 15a11bd4605..f90e13c957a 100644 --- a/src/components/Pagination/tests/Pagination.test.tsx +++ b/src/components/Pagination/tests/Pagination.test.tsx @@ -1,13 +1,14 @@ import React from 'react'; import {mountWithApp} from 'tests/utilities'; import type {CustomRoot} from '@shopify/react-testing'; -import {Tooltip, TextField} from 'components'; import {Key} from '../../../types'; import {Pagination} from '../Pagination'; import {Button} from '../../Button'; import {ButtonGroup} from '../../ButtonGroup'; +import {TextField} from '../../TextField'; import {TextStyle} from '../../TextStyle'; +import {Tooltip} from '../../Tooltip'; import en from '../../../../locales/en.json'; interface HandlerMap { diff --git a/src/components/Popover/components/Pane/tests/Pane.test.tsx b/src/components/Popover/components/Pane/tests/Pane.test.tsx index 71622792584..42703fbc71b 100644 --- a/src/components/Popover/components/Pane/tests/Pane.test.tsx +++ b/src/components/Popover/components/Pane/tests/Pane.test.tsx @@ -1,7 +1,8 @@ import React from 'react'; -import {TextContainer, Scrollable} from 'components'; import {mountWithApp} from 'tests/utilities'; +import {Scrollable} from '../../../../Scrollable'; +import {TextContainer} from '../../../../TextContainer'; import {Pane} from '../Pane'; import {Section} from '../../Section'; diff --git a/src/components/Popover/components/PopoverOverlay/tests/PopoverOverlay.test.tsx b/src/components/Popover/components/PopoverOverlay/tests/PopoverOverlay.test.tsx index f999324bdde..b51a5682917 100644 --- a/src/components/Popover/components/PopoverOverlay/tests/PopoverOverlay.test.tsx +++ b/src/components/Popover/components/PopoverOverlay/tests/PopoverOverlay.test.tsx @@ -1,8 +1,10 @@ import React, {useRef} from 'react'; import {mountWithApp} from 'tests/utilities'; -import {TextContainer, TextField, EventListener} from 'components'; import {Key} from '../../../../../types'; +import {EventListener} from '../../../../EventListener'; +import {TextContainer} from '../../../../TextContainer'; +import {TextField} from '../../../../TextField'; import {PositionedOverlay} from '../../../../PositionedOverlay'; import {PopoverOverlay} from '../PopoverOverlay'; diff --git a/src/components/Popover/components/Section/tests/Section.test.tsx b/src/components/Popover/components/Section/tests/Section.test.tsx index 72be13b22fa..637e80095bb 100644 --- a/src/components/Popover/components/Section/tests/Section.test.tsx +++ b/src/components/Popover/components/Section/tests/Section.test.tsx @@ -1,7 +1,7 @@ import React from 'react'; import {mountWithApp} from 'tests/utilities'; -import {TextContainer} from 'components'; +import {TextContainer} from '../../../../TextContainer'; import {Section} from '../Section'; describe('<Section />', () => { diff --git a/src/components/Popover/tests/Popover.test.tsx b/src/components/Popover/tests/Popover.test.tsx index 05f78acff43..c71393b8020 100644 --- a/src/components/Popover/tests/Popover.test.tsx +++ b/src/components/Popover/tests/Popover.test.tsx @@ -1,7 +1,7 @@ import React, {useCallback, useRef, useState} from 'react'; import {mountWithApp} from 'tests/utilities'; -import {Portal} from 'components'; +import {Portal} from '../../Portal'; import {PositionedOverlay} from '../../PositionedOverlay'; import {Popover} from '../Popover'; import type {PopoverPublicAPI} from '../Popover'; diff --git a/src/components/ResourceItem/tests/ResourceItem.test.tsx b/src/components/ResourceItem/tests/ResourceItem.test.tsx index a3287ccb755..d8c9b66d699 100644 --- a/src/components/ResourceItem/tests/ResourceItem.test.tsx +++ b/src/components/ResourceItem/tests/ResourceItem.test.tsx @@ -1,14 +1,12 @@ import React, {AllHTMLAttributes} from 'react'; import {mountWithApp} from 'tests/utilities'; -import { - Avatar, - ButtonGroup, - Checkbox, - Thumbnail, - UnstyledLink, - Button, -} from 'components'; +import {Avatar} from '../../Avatar'; +import {Button} from '../../Button'; +import {ButtonGroup} from '../../ButtonGroup'; +import {Checkbox} from '../../Checkbox'; +import {Thumbnail} from '../../Thumbnail'; +import {UnstyledLink} from '../../UnstyledLink'; import {ResourceItem} from '../ResourceItem'; import {ResourceListContext} from '../../../utilities/resource-list'; import styles from '../ResourceItem.scss'; diff --git a/src/components/ResourceList/components/FilterControl/components/DateSelector/tests/DateSelector.test.tsx b/src/components/ResourceList/components/FilterControl/components/DateSelector/tests/DateSelector.test.tsx index e9d04a55bd1..5d72656242a 100644 --- a/src/components/ResourceList/components/FilterControl/components/DateSelector/tests/DateSelector.test.tsx +++ b/src/components/ResourceList/components/FilterControl/components/DateSelector/tests/DateSelector.test.tsx @@ -1,7 +1,9 @@ import React from 'react'; -import {DatePicker, Select, TextField} from 'components'; import {mountWithApp} from 'tests/utilities'; +import {DatePicker} from '../../../../../../DatePicker'; +import {Select} from '../../../../../../Select'; +import {TextField} from '../../../../../../TextField'; import { DateSelector, DateSelectorProps, diff --git a/src/components/ResourceList/components/FilterControl/components/FilterCreator/tests/FilterCreator.test.tsx b/src/components/ResourceList/components/FilterControl/components/FilterCreator/tests/FilterCreator.test.tsx index 9b7233121af..0e32a617c6d 100644 --- a/src/components/ResourceList/components/FilterControl/components/FilterCreator/tests/FilterCreator.test.tsx +++ b/src/components/ResourceList/components/FilterControl/components/FilterCreator/tests/FilterCreator.test.tsx @@ -1,8 +1,10 @@ import React from 'react'; -import {mountWithApp} from 'tests/utilities'; -import type {CustomRoot} from '@shopify/react-testing'; -import {Button, Select, Popover, Form} from 'components'; +import {mountWithApp, CustomRoot} from 'tests/utilities'; +import {Button} from '../../../../../../Button'; +import {Form} from '../../../../../../Form'; +import {Popover} from '../../../../../../Popover'; +import {Select} from '../../../../../../Select'; import {FilterCreator, FilterCreatorProps} from '../FilterCreator'; import {FilterValueSelector} from '../../FilterValueSelector'; import {FilterType} from '../../../types'; diff --git a/src/components/ResourceList/components/FilterControl/components/FilterValueSelector/tests/FilterValueSelector.test.tsx b/src/components/ResourceList/components/FilterControl/components/FilterValueSelector/tests/FilterValueSelector.test.tsx index 212aa428485..e06b677c4ae 100644 --- a/src/components/ResourceList/components/FilterControl/components/FilterValueSelector/tests/FilterValueSelector.test.tsx +++ b/src/components/ResourceList/components/FilterControl/components/FilterValueSelector/tests/FilterValueSelector.test.tsx @@ -1,7 +1,8 @@ import React from 'react'; import {mountWithApp} from 'tests/utilities'; -import {Select, TextField} from 'components'; +import {Select} from '../../../../../../Select'; +import {TextField} from '../../../../../../TextField'; import {FilterValueSelector} from '../FilterValueSelector'; import {DateSelector} from '../../DateSelector'; import {Filter, FilterType, Operator} from '../../../types'; diff --git a/src/components/ResourceList/components/FilterControl/tests/FilterControl.test.tsx b/src/components/ResourceList/components/FilterControl/tests/FilterControl.test.tsx index 0d4bddcf316..cf9a3c296a4 100644 --- a/src/components/ResourceList/components/FilterControl/tests/FilterControl.test.tsx +++ b/src/components/ResourceList/components/FilterControl/tests/FilterControl.test.tsx @@ -1,7 +1,9 @@ import React from 'react'; import {mountWithApp} from 'tests/utilities'; -import {TextField, Tag, Button} from 'components'; +import {Button} from '../../../../Button'; +import {TextField} from '../../../../TextField'; +import {Tag} from '../../../../Tag'; import {ResourceListContext} from '../../../../../utilities/resource-list'; import { Filter, diff --git a/src/components/ResourceList/tests/ResourceList.test.tsx b/src/components/ResourceList/tests/ResourceList.test.tsx index eda9638380d..7d564585b14 100644 --- a/src/components/ResourceList/tests/ResourceList.test.tsx +++ b/src/components/ResourceList/tests/ResourceList.test.tsx @@ -1,19 +1,17 @@ import React from 'react'; -import { - ResourceList, - Select, - Spinner, - EmptySearchResult, - ResourceItem, - EventListener, - Button, - EmptyState, -} from 'components'; import {mountWithApp} from 'tests/utilities'; -import {SELECT_ALL_ITEMS} from '../../../utilities/resource-list'; import {BulkActions} from '../../BulkActions'; +import {Button} from '../../Button'; import {CheckableButton} from '../../CheckableButton'; +import {EmptySearchResult} from '../../EmptySearchResult'; +import {EmptyState} from '../../EmptyState'; +import {EventListener} from '../../EventListener'; +import {Select} from '../../Select'; +import {Spinner} from '../../Spinner'; +import {ResourceItem} from '../../ResourceItem'; +import {SELECT_ALL_ITEMS} from '../../../utilities/resource-list'; +import {ResourceList} from '../ResourceList'; import styles from '../ResourceList.scss'; const itemsNoID = [{url: 'item 1'}, {url: 'item 2'}]; diff --git a/src/components/Select/tests/Select.test.tsx b/src/components/Select/tests/Select.test.tsx index fcddc25f90d..4598d81b982 100644 --- a/src/components/Select/tests/Select.test.tsx +++ b/src/components/Select/tests/Select.test.tsx @@ -1,8 +1,10 @@ import React from 'react'; -import {InlineError, Icon, Labelled} from 'components'; import {mountWithApp} from 'tests/utilities'; import {CircleTickOutlineMinor} from '@shopify/polaris-icons'; +import {InlineError} from '../../InlineError'; +import {Icon} from '../../Icon'; +import {Labelled} from '../../Labelled'; import {Select} from '../Select'; describe('<Select />', () => { diff --git a/src/components/Sheet/tests/Sheet.test.tsx b/src/components/Sheet/tests/Sheet.test.tsx index a2672c1179e..bfd2df6deea 100644 --- a/src/components/Sheet/tests/Sheet.test.tsx +++ b/src/components/Sheet/tests/Sheet.test.tsx @@ -1,9 +1,10 @@ /* eslint-disable import/no-deprecated */ import React, {useRef} from 'react'; import {CSSTransition} from 'react-transition-group'; -import {Backdrop, Button} from 'components'; import {mountWithApp} from 'tests/utilities'; +import {Backdrop} from '../../Backdrop'; +import {Button} from '../../Button'; import {Sheet} from '../Sheet'; describe('<Sheet />', () => { diff --git a/src/components/SkeletonPage/tests/SkeletonPage.test.tsx b/src/components/SkeletonPage/tests/SkeletonPage.test.tsx index 56045021627..3dee95d5ef8 100644 --- a/src/components/SkeletonPage/tests/SkeletonPage.test.tsx +++ b/src/components/SkeletonPage/tests/SkeletonPage.test.tsx @@ -1,13 +1,11 @@ import React from 'react'; import {mountWithApp} from 'tests/utilities'; -import { - Layout, - Card, - SkeletonBodyText, - DisplayText, - SkeletonDisplayText, -} from 'components'; +import {Card} from '../../Card'; +import {DisplayText} from '../../DisplayText'; +import {Layout} from '../../Layout'; +import {SkeletonBodyText} from '../../SkeletonBodyText'; +import {SkeletonDisplayText} from '../../SkeletonDisplayText'; import {SkeletonPage} from '../SkeletonPage'; describe('<SkeletonPage />', () => { diff --git a/src/components/Subheading/tests/Subheading.test.tsx b/src/components/Subheading/tests/Subheading.test.tsx index da2104b9bb8..efe29cb439a 100644 --- a/src/components/Subheading/tests/Subheading.test.tsx +++ b/src/components/Subheading/tests/Subheading.test.tsx @@ -1,7 +1,7 @@ import React from 'react'; import {mountWithApp} from 'tests/utilities'; -import {Button} from 'components'; +import {Button} from '../../Button'; import {Subheading} from '../Subheading'; describe('<Subheading />', () => { diff --git a/src/components/Tabs/components/Item/tests/Item.test.tsx b/src/components/Tabs/components/Item/tests/Item.test.tsx index 84189da9116..45f59da04ba 100644 --- a/src/components/Tabs/components/Item/tests/Item.test.tsx +++ b/src/components/Tabs/components/Item/tests/Item.test.tsx @@ -1,7 +1,7 @@ import React from 'react'; import {mountWithApp} from 'tests/utilities'; -import {UnstyledLink} from 'components'; +import {UnstyledLink} from '../../../../UnstyledLink'; import {Item} from '../Item'; describe('<Item />', () => { diff --git a/src/components/TextField/tests/TextField.test.tsx b/src/components/TextField/tests/TextField.test.tsx index 73c33a595cb..a54bd2b568f 100644 --- a/src/components/TextField/tests/TextField.test.tsx +++ b/src/components/TextField/tests/TextField.test.tsx @@ -1,7 +1,10 @@ import React from 'react'; -import {InlineError, Labelled, Connected, Select} from 'components'; import {mountWithApp} from 'tests/utilities'; +import {Connected} from '../../Connected'; +import {InlineError} from '../../InlineError'; +import {Labelled} from '../../Labelled'; +import {Select} from '../../Select'; import {Resizer, Spinner} from '../components'; import {TextField} from '../TextField'; import styles from '../TextField.scss'; diff --git a/src/components/Tooltip/tests/Tooltip.test.tsx b/src/components/Tooltip/tests/Tooltip.test.tsx index c7c22af9bc4..fd90df9b15a 100644 --- a/src/components/Tooltip/tests/Tooltip.test.tsx +++ b/src/components/Tooltip/tests/Tooltip.test.tsx @@ -1,7 +1,7 @@ import React from 'react'; import {mountWithApp} from 'tests/utilities'; -import {Link} from 'components'; +import {Link} from '../../Link'; import {Tooltip} from '../Tooltip'; import {TooltipOverlay} from '../components'; import {Key} from '../../../types'; diff --git a/src/components/TopBar/components/Menu/tests/Menu.test.tsx b/src/components/TopBar/components/Menu/tests/Menu.test.tsx index 310938cded6..ba6893d18a9 100644 --- a/src/components/TopBar/components/Menu/tests/Menu.test.tsx +++ b/src/components/TopBar/components/Menu/tests/Menu.test.tsx @@ -1,7 +1,8 @@ import React from 'react'; import {mountWithApp} from 'tests/utilities'; -import {ActionList, Popover} from 'components'; +import {ActionList} from '../../../../ActionList'; +import {Popover} from '../../../../Popover'; import {Menu} from '../Menu'; import {Message} from '../components'; diff --git a/src/components/TopBar/tests/TopBar.test.tsx b/src/components/TopBar/tests/TopBar.test.tsx index b1cf601ef9c..51e28384444 100644 --- a/src/components/TopBar/tests/TopBar.test.tsx +++ b/src/components/TopBar/tests/TopBar.test.tsx @@ -1,7 +1,8 @@ import React from 'react'; import {mountWithApp} from 'tests/utilities'; -import {Image, UnstyledLink} from 'components'; +import {Image} from '../../Image'; +import {UnstyledLink} from '../../UnstyledLink'; import {TopBar} from '../TopBar'; import {Menu, SearchField, UserMenu, Search} from '../components'; diff --git a/src/components/TrapFocus/tests/TrapFocus.test.tsx b/src/components/TrapFocus/tests/TrapFocus.test.tsx index 952745b8b6b..bcdc1a5c787 100644 --- a/src/components/TrapFocus/tests/TrapFocus.test.tsx +++ b/src/components/TrapFocus/tests/TrapFocus.test.tsx @@ -1,14 +1,12 @@ import React from 'react'; import {mountWithApp} from 'tests/utilities'; -import { - EventListener, - Focus, - TextContainer, - TextField, - Button, - Portal, -} from 'components'; +import {Button} from '../../Button'; +import {EventListener} from '../../EventListener'; +import {Focus} from '../../Focus'; +import {TextContainer} from '../../TextContainer'; +import {TextField} from '../../TextField'; +import {Portal} from '../../Portal'; import * as focusUtils from '../../../utilities/focus'; import {TrapFocus} from '../TrapFocus'; import {Key} from '../../../types'; diff --git a/src/components/UnstyledButton/tests/UnstyledButton.test.tsx b/src/components/UnstyledButton/tests/UnstyledButton.test.tsx index 35d9dbcb0cd..fd9ba1c6832 100644 --- a/src/components/UnstyledButton/tests/UnstyledButton.test.tsx +++ b/src/components/UnstyledButton/tests/UnstyledButton.test.tsx @@ -1,7 +1,7 @@ import React from 'react'; import {mountWithApp} from 'tests/utilities'; -import {UnstyledLink} from 'components'; +import {UnstyledLink} from '../../UnstyledLink'; import {UnstyledButton} from '../UnstyledButton'; describe('<Button />', () => { diff --git a/src/utilities/index-table/tests/hooks-useContainerScroll.test.tsx b/src/utilities/index-table/tests/hooks-useContainerScroll.test.tsx index de950d0f23e..1ccc83dc2ee 100644 --- a/src/utilities/index-table/tests/hooks-useContainerScroll.test.tsx +++ b/src/utilities/index-table/tests/hooks-useContainerScroll.test.tsx @@ -1,9 +1,12 @@ import React from 'react'; import {mountWithApp} from 'tests/utilities'; -import {IndexTable, IndexTableProps} from 'components'; // eslint-disable-next-line @shopify/strict-component-boundaries -import {ScrollContainer} from '../../../components/IndexTable'; +import { + IndexTable, + IndexTableProps, + ScrollContainer, +} from '../../../components/IndexTable'; import {useContainerScroll} from '../hooks'; function Component({condensed}: {condensed?: boolean}) { diff --git a/src/utilities/index-table/tests/hooks-useRowHovered.test.tsx b/src/utilities/index-table/tests/hooks-useRowHovered.test.tsx index be50506303e..6b2e2407775 100644 --- a/src/utilities/index-table/tests/hooks-useRowHovered.test.tsx +++ b/src/utilities/index-table/tests/hooks-useRowHovered.test.tsx @@ -1,7 +1,8 @@ import React from 'react'; import {mountWithApp} from 'tests/utilities'; -import {IndexTable, IndexTableProps} from '../../../components'; +// eslint-disable-next-line @shopify/strict-component-boundaries +import {IndexTable, IndexTableProps} from '../../../components/IndexTable'; import {useRowHovered} from '../hooks'; function Component() { diff --git a/src/utilities/index-table/tests/hooks-useRowSelected.test.tsx b/src/utilities/index-table/tests/hooks-useRowSelected.test.tsx index 3fbe9ccd87f..055a3a5a132 100644 --- a/src/utilities/index-table/tests/hooks-useRowSelected.test.tsx +++ b/src/utilities/index-table/tests/hooks-useRowSelected.test.tsx @@ -1,7 +1,8 @@ import React from 'react'; import {mountWithApp} from 'tests/utilities'; -import {IndexTable, IndexTableProps} from '../../../components'; +// eslint-disable-next-line @shopify/strict-component-boundaries +import {IndexTable, IndexTableProps} from '../../../components/IndexTable'; import {useRowSelected} from '../hooks'; function Component() { diff --git a/tsconfig.json b/tsconfig.json index 7951bf69b4d..713fea0c362 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -11,7 +11,6 @@ "importsNotUsedAsValues": "error", "strictFunctionTypes": false, "paths": { - "components": ["./src/components"], "tests/*": ["./tests/*"] } },