From 61915ced2a350da17f8d1a1c520070796dc90d46 Mon Sep 17 00:00:00 2001 From: Tristan Watanabe Date: Fri, 14 Oct 2022 11:11:07 -0400 Subject: [PATCH] chore(react-menu): migrate to new package structure (#25015) --- ...eact-menu-a2019e67-ddb5-4084-ab5c-661c427cdc9c.json | 7 +++++++ packages/react-components/react-menu/.npmignore | 5 +++-- .../react-components/react-menu/.storybook/main.js | 2 +- .../react-menu/.storybook/tsconfig.json | 2 +- .../react-components/react-menu/{ => docs}/Spec.md | 0 packages/react-components/react-menu/package.json | 7 ++++--- .../Menu.e2e.tsx => src/components/Menu/Menu.cy.tsx} | 6 +++++- .../react-menu/src/components/Menu/Menu.test.tsx | 2 +- .../src/components/MenuDivider/MenuDivider.test.tsx | 2 +- .../src/components/MenuGroup/MenuGroup.test.tsx | 2 +- .../MenuGroupHeader/MenuGroupHeader.test.tsx | 2 +- .../src/components/MenuItem/MenuItem.test.tsx | 4 ++-- .../MenuItemCheckbox/MenuItemCheckbox.test.tsx | 4 ++-- .../components/MenuItemRadio/MenuItemRadio.test.tsx | 2 +- .../components/MenuList/MenuList.cy.tsx} | 2 +- .../src/components/MenuList/MenuList.test.tsx | 2 +- .../src/components/MenuPopover/MenuPopover.test.tsx | 2 +- .../components/MenuSplitGroup/MenuSplitGroup.test.tsx | 2 +- .../src/components/MenuTrigger/MenuTrigger.test.tsx | 4 ++-- .../react-menu/src/{common => testing}/isConformant.ts | 0 .../src/{common => testing}/mockUseMenuContext.ts | 0 .../react-menu/{e2e => src/testing}/selectors.ts | 0 .../stories/Menu/MenuAligningWithIcons.stories.tsx | 0 .../Menu/MenuAligningWithSelectableItems.stories.tsx | 0 .../stories/Menu/MenuAnchorToTarget.stories.tsx | 0 .../{src => }/stories/Menu/MenuBestPractices.md | 0 .../stories/Menu/MenuCheckboxItems.stories.tsx | 0 .../Menu/MenuControlledCheckboxItems.stories.tsx | 0 .../stories/Menu/MenuControlledRadioItems.stories.tsx | 0 .../Menu/MenuControllingOpenAndClose.stories.tsx | 0 .../stories/Menu/MenuCustomTrigger.stories.tsx | 0 .../{src => }/stories/Menu/MenuDefault.stories.tsx | 0 .../{src => }/stories/Menu/MenuDescription.md | 0 .../stories/Menu/MenuGroupingItems.stories.tsx | 0 .../{src => }/stories/Menu/MenuInteraction.stories.tsx | 0 .../stories/Menu/MenuMemoizedMenuItems.stories.tsx | 0 .../stories/Menu/MenuMenuItemsWithIcons.stories.tsx | 0 .../stories/Menu/MenuNestedSubmenus.stories.tsx | 0 .../Menu/MenuNestedSubmenusControlled.stories.tsx | 0 .../{src => }/stories/Menu/MenuRadioItems.stories.tsx | 0 .../stories/Menu/MenuRenderFunctionTrigger.stories.tsx | 0 .../Menu/MenuSecondaryContentForMenuItems.stories.tsx | 0 .../stories/Menu/MenuSelectionGroup.stories.tsx | 0 .../stories/Menu/MenuSplitMenuItem.stories.tsx | 0 .../stories/Menu/MenuTriggerWithTooltip.stories.tsx | 0 .../stories/Menu/MenuVisualDividerOnly.stories.tsx | 0 .../{src => }/stories/Menu/index.stories.tsx | 0 .../stories/MenuList/MenuListDefault.stories.tsx | 0 .../{src => }/stories/MenuList/MenuListDescription.md | 0 .../MenuList/MenuListNestedSubmenus.stories.tsx | 0 .../{src => }/stories/MenuList/index.stories.tsx | 0 .../react-menu/{e2e/tsconfig.json => tsconfig.cy.json} | 4 ++-- packages/react-components/react-menu/tsconfig.json | 2 +- packages/react-components/react-menu/tsconfig.lib.json | 6 ++++-- .../react-components/react-menu/tsconfig.spec.json | 10 +++++++++- 55 files changed, 52 insertions(+), 29 deletions(-) create mode 100644 change/@fluentui-react-menu-a2019e67-ddb5-4084-ab5c-661c427cdc9c.json rename packages/react-components/react-menu/{ => docs}/Spec.md (100%) rename packages/react-components/react-menu/{e2e/Menu.e2e.tsx => src/components/Menu/Menu.cy.tsx} (99%) rename packages/react-components/react-menu/{e2e/MenuList.e2e.tsx => src/components/MenuList/MenuList.cy.tsx} (98%) rename packages/react-components/react-menu/src/{common => testing}/isConformant.ts (100%) rename packages/react-components/react-menu/src/{common => testing}/mockUseMenuContext.ts (100%) rename packages/react-components/react-menu/{e2e => src/testing}/selectors.ts (100%) rename packages/react-components/react-menu/{src => }/stories/Menu/MenuAligningWithIcons.stories.tsx (100%) rename packages/react-components/react-menu/{src => }/stories/Menu/MenuAligningWithSelectableItems.stories.tsx (100%) rename packages/react-components/react-menu/{src => }/stories/Menu/MenuAnchorToTarget.stories.tsx (100%) rename packages/react-components/react-menu/{src => }/stories/Menu/MenuBestPractices.md (100%) rename packages/react-components/react-menu/{src => }/stories/Menu/MenuCheckboxItems.stories.tsx (100%) rename packages/react-components/react-menu/{src => }/stories/Menu/MenuControlledCheckboxItems.stories.tsx (100%) rename packages/react-components/react-menu/{src => }/stories/Menu/MenuControlledRadioItems.stories.tsx (100%) rename packages/react-components/react-menu/{src => }/stories/Menu/MenuControllingOpenAndClose.stories.tsx (100%) rename packages/react-components/react-menu/{src => }/stories/Menu/MenuCustomTrigger.stories.tsx (100%) rename packages/react-components/react-menu/{src => }/stories/Menu/MenuDefault.stories.tsx (100%) rename packages/react-components/react-menu/{src => }/stories/Menu/MenuDescription.md (100%) rename packages/react-components/react-menu/{src => }/stories/Menu/MenuGroupingItems.stories.tsx (100%) rename packages/react-components/react-menu/{src => }/stories/Menu/MenuInteraction.stories.tsx (100%) rename packages/react-components/react-menu/{src => }/stories/Menu/MenuMemoizedMenuItems.stories.tsx (100%) rename packages/react-components/react-menu/{src => }/stories/Menu/MenuMenuItemsWithIcons.stories.tsx (100%) rename packages/react-components/react-menu/{src => }/stories/Menu/MenuNestedSubmenus.stories.tsx (100%) rename packages/react-components/react-menu/{src => }/stories/Menu/MenuNestedSubmenusControlled.stories.tsx (100%) rename packages/react-components/react-menu/{src => }/stories/Menu/MenuRadioItems.stories.tsx (100%) rename packages/react-components/react-menu/{src => }/stories/Menu/MenuRenderFunctionTrigger.stories.tsx (100%) rename packages/react-components/react-menu/{src => }/stories/Menu/MenuSecondaryContentForMenuItems.stories.tsx (100%) rename packages/react-components/react-menu/{src => }/stories/Menu/MenuSelectionGroup.stories.tsx (100%) rename packages/react-components/react-menu/{src => }/stories/Menu/MenuSplitMenuItem.stories.tsx (100%) rename packages/react-components/react-menu/{src => }/stories/Menu/MenuTriggerWithTooltip.stories.tsx (100%) rename packages/react-components/react-menu/{src => }/stories/Menu/MenuVisualDividerOnly.stories.tsx (100%) rename packages/react-components/react-menu/{src => }/stories/Menu/index.stories.tsx (100%) rename packages/react-components/react-menu/{src => }/stories/MenuList/MenuListDefault.stories.tsx (100%) rename packages/react-components/react-menu/{src => }/stories/MenuList/MenuListDescription.md (100%) rename packages/react-components/react-menu/{src => }/stories/MenuList/MenuListNestedSubmenus.stories.tsx (100%) rename packages/react-components/react-menu/{src => }/stories/MenuList/index.stories.tsx (100%) rename packages/react-components/react-menu/{e2e/tsconfig.json => tsconfig.cy.json} (70%) diff --git a/change/@fluentui-react-menu-a2019e67-ddb5-4084-ab5c-661c427cdc9c.json b/change/@fluentui-react-menu-a2019e67-ddb5-4084-ab5c-661c427cdc9c.json new file mode 100644 index 00000000000000..dc60b1279766f2 --- /dev/null +++ b/change/@fluentui-react-menu-a2019e67-ddb5-4084-ab5c-661c427cdc9c.json @@ -0,0 +1,7 @@ +{ + "type": "patch", + "comment": "chore: Migrate to new package structure", + "packageName": "@fluentui/react-menu", + "email": "tristan.watanabe@gmail.com", + "dependentChangeType": "patch" +} diff --git a/packages/react-components/react-menu/.npmignore b/packages/react-components/react-menu/.npmignore index 52d2a7273a151d..f7ce568a6dbf7c 100644 --- a/packages/react-components/react-menu/.npmignore +++ b/packages/react-components/react-menu/.npmignore @@ -3,10 +3,11 @@ bundle-size/ config/ coverage/ -e2e/ +docs/ etc/ node_modules/ src/ +stories/ dist/types/ temp/ __fixtures__ @@ -16,7 +17,7 @@ __tests__ *.api.json *.log *.spec.* -*.stories.* +*.cy.* *.test.* *.yml diff --git a/packages/react-components/react-menu/.storybook/main.js b/packages/react-components/react-menu/.storybook/main.js index f57cfd09509e78..26536b61b387f6 100644 --- a/packages/react-components/react-menu/.storybook/main.js +++ b/packages/react-components/react-menu/.storybook/main.js @@ -2,7 +2,7 @@ const rootMain = require('../../../../.storybook/main'); module.exports = /** @type {Omit} */ ({ ...rootMain, - stories: [...rootMain.stories, '../src/**/*.stories.mdx', '../src/**/index.stories.@(ts|tsx)'], + stories: [...rootMain.stories, '../stories/**/*.stories.mdx', '../stories/**/index.stories.@(ts|tsx)'], addons: [...rootMain.addons], webpackFinal: (config, options) => { const localConfig = { ...rootMain.webpackFinal(config, options) }; diff --git a/packages/react-components/react-menu/.storybook/tsconfig.json b/packages/react-components/react-menu/.storybook/tsconfig.json index f9f60e1234ed49..ea89218a3d916f 100644 --- a/packages/react-components/react-menu/.storybook/tsconfig.json +++ b/packages/react-components/react-menu/.storybook/tsconfig.json @@ -6,5 +6,5 @@ "checkJs": true, "types": ["static-assets", "environment", "storybook__addons"] }, - "include": ["../src/**/*.stories.ts", "../src/**/*.stories.tsx", "*.js"] + "include": ["../stories/**/*.stories.ts", "../stories/**/*.stories.tsx", "*.js"] } diff --git a/packages/react-components/react-menu/Spec.md b/packages/react-components/react-menu/docs/Spec.md similarity index 100% rename from packages/react-components/react-menu/Spec.md rename to packages/react-components/react-menu/docs/Spec.md diff --git a/packages/react-components/react-menu/package.json b/packages/react-components/react-menu/package.json index f5f449b142418c..26c3d259821805 100644 --- a/packages/react-components/react-menu/package.json +++ b/packages/react-components/react-menu/package.json @@ -4,7 +4,7 @@ "description": "Fluent UI menu component", "main": "lib-commonjs/index.js", "module": "lib/index.js", - "typings": "dist/index.d.ts", + "typings": "./dist/index.d.ts", "sideEffects": false, "repository": { "type": "git", @@ -61,9 +61,10 @@ }, "exports": { ".": { - "types": "./lib/index.d.ts", + "types": "./dist/index.d.ts", "import": "./lib/index.js", "require": "./lib-commonjs/index.js" - } + }, + "./package.json": "./package.json" } } diff --git a/packages/react-components/react-menu/e2e/Menu.e2e.tsx b/packages/react-components/react-menu/src/components/Menu/Menu.cy.tsx similarity index 99% rename from packages/react-components/react-menu/e2e/Menu.e2e.tsx rename to packages/react-components/react-menu/src/components/Menu/Menu.cy.tsx index dbbac0c6109aaf..fad7b7c65d087b 100644 --- a/packages/react-components/react-menu/e2e/Menu.e2e.tsx +++ b/packages/react-components/react-menu/src/components/Menu/Menu.cy.tsx @@ -10,7 +10,7 @@ import { menuTriggerSelector, menuItemSelector, menuSelector, -} from './selectors'; +} from '../../testing/selectors'; import { Menu, @@ -149,6 +149,7 @@ describe('Custom Trigger', () => { }; return ( + // eslint-disable-next-line react/jsx-no-bind @@ -692,6 +693,7 @@ describe(`Nested Menus`, () => { }; return ( + // eslint-disable-next-line react/jsx-no-bind Editor Layout @@ -715,6 +717,7 @@ describe(`Nested Menus`, () => { }; return ( + // eslint-disable-next-line react/jsx-no-bind Appearance @@ -739,6 +742,7 @@ describe(`Nested Menus`, () => { }; return ( + // eslint-disable-next-line react/jsx-no-bind Preferences diff --git a/packages/react-components/react-menu/src/components/Menu/Menu.test.tsx b/packages/react-components/react-menu/src/components/Menu/Menu.test.tsx index 74e17fee7ad820..c4898aa32f5ec4 100644 --- a/packages/react-components/react-menu/src/components/Menu/Menu.test.tsx +++ b/packages/react-components/react-menu/src/components/Menu/Menu.test.tsx @@ -2,7 +2,7 @@ import { resetIdsForTests } from '@fluentui/react-utilities'; import * as React from 'react'; import { Menu } from './Menu'; import { render, fireEvent } from '@testing-library/react'; -import { isConformant } from '../../common/isConformant'; +import { isConformant } from '../../testing/isConformant'; import { MenuTrigger } from '../MenuTrigger/index'; import { MenuList } from '../MenuList/index'; import { MenuItem } from '../MenuItem/index'; diff --git a/packages/react-components/react-menu/src/components/MenuDivider/MenuDivider.test.tsx b/packages/react-components/react-menu/src/components/MenuDivider/MenuDivider.test.tsx index e40b7d1b66130f..6e4453e317f77e 100644 --- a/packages/react-components/react-menu/src/components/MenuDivider/MenuDivider.test.tsx +++ b/packages/react-components/react-menu/src/components/MenuDivider/MenuDivider.test.tsx @@ -1,7 +1,7 @@ import * as React from 'react'; import { MenuDivider } from './MenuDivider'; import * as renderer from 'react-test-renderer'; -import { isConformant } from '../../common/isConformant'; +import { isConformant } from '../../testing/isConformant'; describe('MenuDivider', () => { isConformant({ diff --git a/packages/react-components/react-menu/src/components/MenuGroup/MenuGroup.test.tsx b/packages/react-components/react-menu/src/components/MenuGroup/MenuGroup.test.tsx index bdba2f975b5bfa..85bdb562393f90 100644 --- a/packages/react-components/react-menu/src/components/MenuGroup/MenuGroup.test.tsx +++ b/packages/react-components/react-menu/src/components/MenuGroup/MenuGroup.test.tsx @@ -3,7 +3,7 @@ import * as React from 'react'; import { MenuGroup } from './MenuGroup'; import * as renderer from 'react-test-renderer'; import { render } from '@testing-library/react'; -import { isConformant } from '../../common/isConformant'; +import { isConformant } from '../../testing/isConformant'; describe('MenuGroup', () => { isConformant({ diff --git a/packages/react-components/react-menu/src/components/MenuGroupHeader/MenuGroupHeader.test.tsx b/packages/react-components/react-menu/src/components/MenuGroupHeader/MenuGroupHeader.test.tsx index 71d3562f1fc1ff..0e35a4f1f9d451 100644 --- a/packages/react-components/react-menu/src/components/MenuGroupHeader/MenuGroupHeader.test.tsx +++ b/packages/react-components/react-menu/src/components/MenuGroupHeader/MenuGroupHeader.test.tsx @@ -2,7 +2,7 @@ import * as React from 'react'; import { MenuGroupHeader } from './MenuGroupHeader'; import * as renderer from 'react-test-renderer'; import { render } from '@testing-library/react'; -import { isConformant } from '../../common/isConformant'; +import { isConformant } from '../../testing/isConformant'; import { MenuGroupContextProvider } from '../../contexts/menuGroupContext'; describe('MenuGroupHeader', () => { diff --git a/packages/react-components/react-menu/src/components/MenuItem/MenuItem.test.tsx b/packages/react-components/react-menu/src/components/MenuItem/MenuItem.test.tsx index a2ab4a39789493..ef83b9809f6779 100644 --- a/packages/react-components/react-menu/src/components/MenuItem/MenuItem.test.tsx +++ b/packages/react-components/react-menu/src/components/MenuItem/MenuItem.test.tsx @@ -3,10 +3,10 @@ import { render, fireEvent, createEvent } from '@testing-library/react'; import { Enter, Space } from '@fluentui/keyboard-keys'; import { MenuItem } from './MenuItem'; import * as renderer from 'react-test-renderer'; -import { isConformant } from '../../common/isConformant'; +import { isConformant } from '../../testing/isConformant'; import { MenuTriggerContextProvider } from '../../contexts/menuTriggerContext'; import { MenuListProvider } from '../../contexts/menuListContext'; -import { mockUseMenuContext } from '../../common/mockUseMenuContext'; +import { mockUseMenuContext } from '../../testing/mockUseMenuContext'; import type { MenuItemProps } from './MenuItem.types'; jest.mock('../../contexts/menuContext'); diff --git a/packages/react-components/react-menu/src/components/MenuItemCheckbox/MenuItemCheckbox.test.tsx b/packages/react-components/react-menu/src/components/MenuItemCheckbox/MenuItemCheckbox.test.tsx index 9d74e3676875aa..e8f8dd8be52edb 100644 --- a/packages/react-components/react-menu/src/components/MenuItemCheckbox/MenuItemCheckbox.test.tsx +++ b/packages/react-components/react-menu/src/components/MenuItemCheckbox/MenuItemCheckbox.test.tsx @@ -2,10 +2,10 @@ import * as React from 'react'; import * as renderer from 'react-test-renderer'; import { Enter, Space } from '@fluentui/keyboard-keys'; import { render, fireEvent } from '@testing-library/react'; -import { isConformant } from '../../common/isConformant'; +import { isConformant } from '../../testing/isConformant'; import { MenuItemCheckbox } from './MenuItemCheckbox'; import { MenuListProvider } from '../../contexts/menuListContext'; -import { mockUseMenuContext } from '../../common/mockUseMenuContext'; +import { mockUseMenuContext } from '../../testing/mockUseMenuContext'; import type { MenuListContextValue } from '../../contexts/menuListContext'; import type { MenuItemCheckboxProps } from './MenuItemCheckbox.types'; diff --git a/packages/react-components/react-menu/src/components/MenuItemRadio/MenuItemRadio.test.tsx b/packages/react-components/react-menu/src/components/MenuItemRadio/MenuItemRadio.test.tsx index 99c06620852fc7..6f506aa5e487bc 100644 --- a/packages/react-components/react-menu/src/components/MenuItemRadio/MenuItemRadio.test.tsx +++ b/packages/react-components/react-menu/src/components/MenuItemRadio/MenuItemRadio.test.tsx @@ -3,7 +3,7 @@ import * as renderer from 'react-test-renderer'; import { Enter, Space } from '@fluentui/keyboard-keys'; import { render, fireEvent } from '@testing-library/react'; import { MenuItemRadio } from './MenuItemRadio'; -import { isConformant } from '../../common/isConformant'; +import { isConformant } from '../../testing/isConformant'; import { MenuListProvider } from '../../contexts/menuListContext'; import type { MenuListContextValue } from '../../contexts/menuListContext'; import type { MenuItemRadioProps } from './MenuItemRadio.types'; diff --git a/packages/react-components/react-menu/e2e/MenuList.e2e.tsx b/packages/react-components/react-menu/src/components/MenuList/MenuList.cy.tsx similarity index 98% rename from packages/react-components/react-menu/e2e/MenuList.e2e.tsx rename to packages/react-components/react-menu/src/components/MenuList/MenuList.cy.tsx index bbd4bb22ea8467..901dff93e101ff 100644 --- a/packages/react-components/react-menu/e2e/MenuList.e2e.tsx +++ b/packages/react-components/react-menu/src/components/MenuList/MenuList.cy.tsx @@ -4,7 +4,7 @@ import { mount as mountBase } from '@cypress/react'; import { FluentProvider } from '@fluentui/react-provider'; import { teamsLightTheme } from '@fluentui/react-theme'; -import { menuTriggerSelector, menuItemSelector, menuSelector } from './selectors'; +import { menuTriggerSelector, menuItemSelector, menuSelector } from '../../testing/selectors'; import { MenuList, MenuItem, Menu, MenuTrigger, MenuPopover } from '@fluentui/react-menu'; const mount = (element: JSX.Element) => { diff --git a/packages/react-components/react-menu/src/components/MenuList/MenuList.test.tsx b/packages/react-components/react-menu/src/components/MenuList/MenuList.test.tsx index ae15108fc7eefb..f0042809ed799b 100644 --- a/packages/react-components/react-menu/src/components/MenuList/MenuList.test.tsx +++ b/packages/react-components/react-menu/src/components/MenuList/MenuList.test.tsx @@ -3,7 +3,7 @@ import { MenuList } from './MenuList'; import * as renderer from 'react-test-renderer'; import { render } from '@testing-library/react'; import { useHasParentContext } from '@fluentui/react-context-selector'; -import { isConformant } from '../../common/isConformant'; +import { isConformant } from '../../testing/isConformant'; import { MenuListContext } from '../../contexts/menuListContext'; describe('MenuList', () => { diff --git a/packages/react-components/react-menu/src/components/MenuPopover/MenuPopover.test.tsx b/packages/react-components/react-menu/src/components/MenuPopover/MenuPopover.test.tsx index e0b6725bd8d1a9..e05988bb9f436e 100644 --- a/packages/react-components/react-menu/src/components/MenuPopover/MenuPopover.test.tsx +++ b/packages/react-components/react-menu/src/components/MenuPopover/MenuPopover.test.tsx @@ -1,7 +1,7 @@ import * as React from 'react'; import { fireEvent, render } from '@testing-library/react'; import { MenuPopover } from './MenuPopover'; -import { isConformant } from '../../common/isConformant'; +import { isConformant } from '../../testing/isConformant'; import { MenuPopoverProps } from './MenuPopover.types'; describe('MenuPopover', () => { diff --git a/packages/react-components/react-menu/src/components/MenuSplitGroup/MenuSplitGroup.test.tsx b/packages/react-components/react-menu/src/components/MenuSplitGroup/MenuSplitGroup.test.tsx index 9693beab128556..d7613d2037cf2d 100644 --- a/packages/react-components/react-menu/src/components/MenuSplitGroup/MenuSplitGroup.test.tsx +++ b/packages/react-components/react-menu/src/components/MenuSplitGroup/MenuSplitGroup.test.tsx @@ -1,7 +1,7 @@ import * as React from 'react'; import { render } from '@testing-library/react'; import { MenuSplitGroup } from './MenuSplitGroup'; -import { isConformant } from '../../common/isConformant'; +import { isConformant } from '../../testing/isConformant'; describe('MenuSplitGroup', () => { isConformant({ diff --git a/packages/react-components/react-menu/src/components/MenuTrigger/MenuTrigger.test.tsx b/packages/react-components/react-menu/src/components/MenuTrigger/MenuTrigger.test.tsx index 7406c1ac612823..4a55ade8fc0dea 100644 --- a/packages/react-components/react-menu/src/components/MenuTrigger/MenuTrigger.test.tsx +++ b/packages/react-components/react-menu/src/components/MenuTrigger/MenuTrigger.test.tsx @@ -2,8 +2,8 @@ import * as React from 'react'; import { MenuTrigger } from './MenuTrigger'; import * as renderer from 'react-test-renderer'; import { createEvent, fireEvent, render } from '@testing-library/react'; -import { isConformant } from '../../common/isConformant'; -import { mockUseMenuContext } from '../../common/mockUseMenuContext'; +import { isConformant } from '../../testing/isConformant'; +import { mockUseMenuContext } from '../../testing/mockUseMenuContext'; import { useMenuTriggerContext_unstable } from '../../contexts/menuTriggerContext'; import { Enter } from '@fluentui/keyboard-keys'; diff --git a/packages/react-components/react-menu/src/common/isConformant.ts b/packages/react-components/react-menu/src/testing/isConformant.ts similarity index 100% rename from packages/react-components/react-menu/src/common/isConformant.ts rename to packages/react-components/react-menu/src/testing/isConformant.ts diff --git a/packages/react-components/react-menu/src/common/mockUseMenuContext.ts b/packages/react-components/react-menu/src/testing/mockUseMenuContext.ts similarity index 100% rename from packages/react-components/react-menu/src/common/mockUseMenuContext.ts rename to packages/react-components/react-menu/src/testing/mockUseMenuContext.ts diff --git a/packages/react-components/react-menu/e2e/selectors.ts b/packages/react-components/react-menu/src/testing/selectors.ts similarity index 100% rename from packages/react-components/react-menu/e2e/selectors.ts rename to packages/react-components/react-menu/src/testing/selectors.ts diff --git a/packages/react-components/react-menu/src/stories/Menu/MenuAligningWithIcons.stories.tsx b/packages/react-components/react-menu/stories/Menu/MenuAligningWithIcons.stories.tsx similarity index 100% rename from packages/react-components/react-menu/src/stories/Menu/MenuAligningWithIcons.stories.tsx rename to packages/react-components/react-menu/stories/Menu/MenuAligningWithIcons.stories.tsx diff --git a/packages/react-components/react-menu/src/stories/Menu/MenuAligningWithSelectableItems.stories.tsx b/packages/react-components/react-menu/stories/Menu/MenuAligningWithSelectableItems.stories.tsx similarity index 100% rename from packages/react-components/react-menu/src/stories/Menu/MenuAligningWithSelectableItems.stories.tsx rename to packages/react-components/react-menu/stories/Menu/MenuAligningWithSelectableItems.stories.tsx diff --git a/packages/react-components/react-menu/src/stories/Menu/MenuAnchorToTarget.stories.tsx b/packages/react-components/react-menu/stories/Menu/MenuAnchorToTarget.stories.tsx similarity index 100% rename from packages/react-components/react-menu/src/stories/Menu/MenuAnchorToTarget.stories.tsx rename to packages/react-components/react-menu/stories/Menu/MenuAnchorToTarget.stories.tsx diff --git a/packages/react-components/react-menu/src/stories/Menu/MenuBestPractices.md b/packages/react-components/react-menu/stories/Menu/MenuBestPractices.md similarity index 100% rename from packages/react-components/react-menu/src/stories/Menu/MenuBestPractices.md rename to packages/react-components/react-menu/stories/Menu/MenuBestPractices.md diff --git a/packages/react-components/react-menu/src/stories/Menu/MenuCheckboxItems.stories.tsx b/packages/react-components/react-menu/stories/Menu/MenuCheckboxItems.stories.tsx similarity index 100% rename from packages/react-components/react-menu/src/stories/Menu/MenuCheckboxItems.stories.tsx rename to packages/react-components/react-menu/stories/Menu/MenuCheckboxItems.stories.tsx diff --git a/packages/react-components/react-menu/src/stories/Menu/MenuControlledCheckboxItems.stories.tsx b/packages/react-components/react-menu/stories/Menu/MenuControlledCheckboxItems.stories.tsx similarity index 100% rename from packages/react-components/react-menu/src/stories/Menu/MenuControlledCheckboxItems.stories.tsx rename to packages/react-components/react-menu/stories/Menu/MenuControlledCheckboxItems.stories.tsx diff --git a/packages/react-components/react-menu/src/stories/Menu/MenuControlledRadioItems.stories.tsx b/packages/react-components/react-menu/stories/Menu/MenuControlledRadioItems.stories.tsx similarity index 100% rename from packages/react-components/react-menu/src/stories/Menu/MenuControlledRadioItems.stories.tsx rename to packages/react-components/react-menu/stories/Menu/MenuControlledRadioItems.stories.tsx diff --git a/packages/react-components/react-menu/src/stories/Menu/MenuControllingOpenAndClose.stories.tsx b/packages/react-components/react-menu/stories/Menu/MenuControllingOpenAndClose.stories.tsx similarity index 100% rename from packages/react-components/react-menu/src/stories/Menu/MenuControllingOpenAndClose.stories.tsx rename to packages/react-components/react-menu/stories/Menu/MenuControllingOpenAndClose.stories.tsx diff --git a/packages/react-components/react-menu/src/stories/Menu/MenuCustomTrigger.stories.tsx b/packages/react-components/react-menu/stories/Menu/MenuCustomTrigger.stories.tsx similarity index 100% rename from packages/react-components/react-menu/src/stories/Menu/MenuCustomTrigger.stories.tsx rename to packages/react-components/react-menu/stories/Menu/MenuCustomTrigger.stories.tsx diff --git a/packages/react-components/react-menu/src/stories/Menu/MenuDefault.stories.tsx b/packages/react-components/react-menu/stories/Menu/MenuDefault.stories.tsx similarity index 100% rename from packages/react-components/react-menu/src/stories/Menu/MenuDefault.stories.tsx rename to packages/react-components/react-menu/stories/Menu/MenuDefault.stories.tsx diff --git a/packages/react-components/react-menu/src/stories/Menu/MenuDescription.md b/packages/react-components/react-menu/stories/Menu/MenuDescription.md similarity index 100% rename from packages/react-components/react-menu/src/stories/Menu/MenuDescription.md rename to packages/react-components/react-menu/stories/Menu/MenuDescription.md diff --git a/packages/react-components/react-menu/src/stories/Menu/MenuGroupingItems.stories.tsx b/packages/react-components/react-menu/stories/Menu/MenuGroupingItems.stories.tsx similarity index 100% rename from packages/react-components/react-menu/src/stories/Menu/MenuGroupingItems.stories.tsx rename to packages/react-components/react-menu/stories/Menu/MenuGroupingItems.stories.tsx diff --git a/packages/react-components/react-menu/src/stories/Menu/MenuInteraction.stories.tsx b/packages/react-components/react-menu/stories/Menu/MenuInteraction.stories.tsx similarity index 100% rename from packages/react-components/react-menu/src/stories/Menu/MenuInteraction.stories.tsx rename to packages/react-components/react-menu/stories/Menu/MenuInteraction.stories.tsx diff --git a/packages/react-components/react-menu/src/stories/Menu/MenuMemoizedMenuItems.stories.tsx b/packages/react-components/react-menu/stories/Menu/MenuMemoizedMenuItems.stories.tsx similarity index 100% rename from packages/react-components/react-menu/src/stories/Menu/MenuMemoizedMenuItems.stories.tsx rename to packages/react-components/react-menu/stories/Menu/MenuMemoizedMenuItems.stories.tsx diff --git a/packages/react-components/react-menu/src/stories/Menu/MenuMenuItemsWithIcons.stories.tsx b/packages/react-components/react-menu/stories/Menu/MenuMenuItemsWithIcons.stories.tsx similarity index 100% rename from packages/react-components/react-menu/src/stories/Menu/MenuMenuItemsWithIcons.stories.tsx rename to packages/react-components/react-menu/stories/Menu/MenuMenuItemsWithIcons.stories.tsx diff --git a/packages/react-components/react-menu/src/stories/Menu/MenuNestedSubmenus.stories.tsx b/packages/react-components/react-menu/stories/Menu/MenuNestedSubmenus.stories.tsx similarity index 100% rename from packages/react-components/react-menu/src/stories/Menu/MenuNestedSubmenus.stories.tsx rename to packages/react-components/react-menu/stories/Menu/MenuNestedSubmenus.stories.tsx diff --git a/packages/react-components/react-menu/src/stories/Menu/MenuNestedSubmenusControlled.stories.tsx b/packages/react-components/react-menu/stories/Menu/MenuNestedSubmenusControlled.stories.tsx similarity index 100% rename from packages/react-components/react-menu/src/stories/Menu/MenuNestedSubmenusControlled.stories.tsx rename to packages/react-components/react-menu/stories/Menu/MenuNestedSubmenusControlled.stories.tsx diff --git a/packages/react-components/react-menu/src/stories/Menu/MenuRadioItems.stories.tsx b/packages/react-components/react-menu/stories/Menu/MenuRadioItems.stories.tsx similarity index 100% rename from packages/react-components/react-menu/src/stories/Menu/MenuRadioItems.stories.tsx rename to packages/react-components/react-menu/stories/Menu/MenuRadioItems.stories.tsx diff --git a/packages/react-components/react-menu/src/stories/Menu/MenuRenderFunctionTrigger.stories.tsx b/packages/react-components/react-menu/stories/Menu/MenuRenderFunctionTrigger.stories.tsx similarity index 100% rename from packages/react-components/react-menu/src/stories/Menu/MenuRenderFunctionTrigger.stories.tsx rename to packages/react-components/react-menu/stories/Menu/MenuRenderFunctionTrigger.stories.tsx diff --git a/packages/react-components/react-menu/src/stories/Menu/MenuSecondaryContentForMenuItems.stories.tsx b/packages/react-components/react-menu/stories/Menu/MenuSecondaryContentForMenuItems.stories.tsx similarity index 100% rename from packages/react-components/react-menu/src/stories/Menu/MenuSecondaryContentForMenuItems.stories.tsx rename to packages/react-components/react-menu/stories/Menu/MenuSecondaryContentForMenuItems.stories.tsx diff --git a/packages/react-components/react-menu/src/stories/Menu/MenuSelectionGroup.stories.tsx b/packages/react-components/react-menu/stories/Menu/MenuSelectionGroup.stories.tsx similarity index 100% rename from packages/react-components/react-menu/src/stories/Menu/MenuSelectionGroup.stories.tsx rename to packages/react-components/react-menu/stories/Menu/MenuSelectionGroup.stories.tsx diff --git a/packages/react-components/react-menu/src/stories/Menu/MenuSplitMenuItem.stories.tsx b/packages/react-components/react-menu/stories/Menu/MenuSplitMenuItem.stories.tsx similarity index 100% rename from packages/react-components/react-menu/src/stories/Menu/MenuSplitMenuItem.stories.tsx rename to packages/react-components/react-menu/stories/Menu/MenuSplitMenuItem.stories.tsx diff --git a/packages/react-components/react-menu/src/stories/Menu/MenuTriggerWithTooltip.stories.tsx b/packages/react-components/react-menu/stories/Menu/MenuTriggerWithTooltip.stories.tsx similarity index 100% rename from packages/react-components/react-menu/src/stories/Menu/MenuTriggerWithTooltip.stories.tsx rename to packages/react-components/react-menu/stories/Menu/MenuTriggerWithTooltip.stories.tsx diff --git a/packages/react-components/react-menu/src/stories/Menu/MenuVisualDividerOnly.stories.tsx b/packages/react-components/react-menu/stories/Menu/MenuVisualDividerOnly.stories.tsx similarity index 100% rename from packages/react-components/react-menu/src/stories/Menu/MenuVisualDividerOnly.stories.tsx rename to packages/react-components/react-menu/stories/Menu/MenuVisualDividerOnly.stories.tsx diff --git a/packages/react-components/react-menu/src/stories/Menu/index.stories.tsx b/packages/react-components/react-menu/stories/Menu/index.stories.tsx similarity index 100% rename from packages/react-components/react-menu/src/stories/Menu/index.stories.tsx rename to packages/react-components/react-menu/stories/Menu/index.stories.tsx diff --git a/packages/react-components/react-menu/src/stories/MenuList/MenuListDefault.stories.tsx b/packages/react-components/react-menu/stories/MenuList/MenuListDefault.stories.tsx similarity index 100% rename from packages/react-components/react-menu/src/stories/MenuList/MenuListDefault.stories.tsx rename to packages/react-components/react-menu/stories/MenuList/MenuListDefault.stories.tsx diff --git a/packages/react-components/react-menu/src/stories/MenuList/MenuListDescription.md b/packages/react-components/react-menu/stories/MenuList/MenuListDescription.md similarity index 100% rename from packages/react-components/react-menu/src/stories/MenuList/MenuListDescription.md rename to packages/react-components/react-menu/stories/MenuList/MenuListDescription.md diff --git a/packages/react-components/react-menu/src/stories/MenuList/MenuListNestedSubmenus.stories.tsx b/packages/react-components/react-menu/stories/MenuList/MenuListNestedSubmenus.stories.tsx similarity index 100% rename from packages/react-components/react-menu/src/stories/MenuList/MenuListNestedSubmenus.stories.tsx rename to packages/react-components/react-menu/stories/MenuList/MenuListNestedSubmenus.stories.tsx diff --git a/packages/react-components/react-menu/src/stories/MenuList/index.stories.tsx b/packages/react-components/react-menu/stories/MenuList/index.stories.tsx similarity index 100% rename from packages/react-components/react-menu/src/stories/MenuList/index.stories.tsx rename to packages/react-components/react-menu/stories/MenuList/index.stories.tsx diff --git a/packages/react-components/react-menu/e2e/tsconfig.json b/packages/react-components/react-menu/tsconfig.cy.json similarity index 70% rename from packages/react-components/react-menu/e2e/tsconfig.json rename to packages/react-components/react-menu/tsconfig.cy.json index f6b23b30d510ba..93a140885851da 100644 --- a/packages/react-components/react-menu/e2e/tsconfig.json +++ b/packages/react-components/react-menu/tsconfig.cy.json @@ -1,9 +1,9 @@ { - "extends": "../tsconfig.json", + "extends": "./tsconfig.json", "compilerOptions": { "isolatedModules": false, "types": ["node", "cypress", "cypress-storybook/cypress", "cypress-real-events"], "lib": ["ES2019", "dom"] }, - "include": ["**/*.ts", "**/*.tsx"] + "include": ["**/*.cy.ts", "**/*.cy.tsx"] } diff --git a/packages/react-components/react-menu/tsconfig.json b/packages/react-components/react-menu/tsconfig.json index 9087bac77cc8d7..1317f81620ca5e 100644 --- a/packages/react-components/react-menu/tsconfig.json +++ b/packages/react-components/react-menu/tsconfig.json @@ -22,7 +22,7 @@ "path": "./.storybook/tsconfig.json" }, { - "path": "./e2e/tsconfig.json" + "path": "./tsconfig.cy.json" } ] } diff --git a/packages/react-components/react-menu/tsconfig.lib.json b/packages/react-components/react-menu/tsconfig.lib.json index 7f94e04299ed85..e17f808c039339 100644 --- a/packages/react-components/react-menu/tsconfig.lib.json +++ b/packages/react-components/react-menu/tsconfig.lib.json @@ -10,13 +10,15 @@ "types": ["static-assets", "environment"] }, "exclude": [ - "./src/common/**", + "./src/testing/**", "**/*.spec.ts", "**/*.spec.tsx", "**/*.test.ts", "**/*.test.tsx", "**/*.stories.ts", - "**/*.stories.tsx" + "**/*.stories.tsx", + "**/*.cy.ts", + "**/*.cy.tsx" ], "include": ["./src/**/*.ts", "./src/**/*.tsx"] } diff --git a/packages/react-components/react-menu/tsconfig.spec.json b/packages/react-components/react-menu/tsconfig.spec.json index 11f8254e711f4c..0e881941843de8 100644 --- a/packages/react-components/react-menu/tsconfig.spec.json +++ b/packages/react-components/react-menu/tsconfig.spec.json @@ -5,5 +5,13 @@ "outDir": "dist", "types": ["jest", "node", "@testing-library/jest-dom"] }, - "include": ["**/*.spec.ts", "**/*.spec.tsx", "**/*.test.ts", "**/*.test.tsx", "**/*.d.ts"] + "include": [ + "**/*.spec.ts", + "**/*.spec.tsx", + "**/*.test.ts", + "**/*.test.tsx", + "**/*.d.ts", + "./src/testing/**/*.ts", + "./src/testing/**/*.tsx" + ] }