diff --git a/change/@fluentui-react-popover-9d77e1ac-fa23-48ff-b502-9268c6455e9c.json b/change/@fluentui-react-popover-9d77e1ac-fa23-48ff-b502-9268c6455e9c.json new file mode 100644 index 00000000000000..c6fb59ba1a5372 --- /dev/null +++ b/change/@fluentui-react-popover-9d77e1ac-fa23-48ff-b502-9268c6455e9c.json @@ -0,0 +1,7 @@ +{ + "type": "patch", + "comment": "chore: Migrate to new package structure.", + "packageName": "@fluentui/react-popover", + "email": "tristan.watanabe@gmail.com", + "dependentChangeType": "patch" +} diff --git a/packages/react-components/react-popover/.npmignore b/packages/react-components/react-popover/.npmignore index 52d2a7273a151d..f7ce568a6dbf7c 100644 --- a/packages/react-components/react-popover/.npmignore +++ b/packages/react-components/react-popover/.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-popover/.storybook/main.js b/packages/react-components/react-popover/.storybook/main.js index f57cfd09509e78..26536b61b387f6 100644 --- a/packages/react-components/react-popover/.storybook/main.js +++ b/packages/react-components/react-popover/.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-popover/.storybook/tsconfig.json b/packages/react-components/react-popover/.storybook/tsconfig.json index f9f60e1234ed49..ea89218a3d916f 100644 --- a/packages/react-components/react-popover/.storybook/tsconfig.json +++ b/packages/react-components/react-popover/.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-popover/Spec.md b/packages/react-components/react-popover/docs/Spec.md similarity index 100% rename from packages/react-components/react-popover/Spec.md rename to packages/react-components/react-popover/docs/Spec.md diff --git a/packages/react-components/react-popover/e2e/Popover.e2e.tsx b/packages/react-components/react-popover/src/components/Popover/Popover.cy.tsx similarity index 99% rename from packages/react-components/react-popover/e2e/Popover.e2e.tsx rename to packages/react-components/react-popover/src/components/Popover/Popover.cy.tsx index 69c846e7b137e2..78935f56ba9314 100644 --- a/packages/react-components/react-popover/e2e/Popover.e2e.tsx +++ b/packages/react-components/react-popover/src/components/Popover/Popover.cy.tsx @@ -29,6 +29,7 @@ describe('Popover', () => { const [open, setOpen] = React.useState(false); return ( + // eslint-disable-next-line react/jsx-no-bind setOpen(data.open)}> @@ -296,6 +297,7 @@ describe('Popover', () => { }; return ( + // eslint-disable-next-line react/jsx-no-bind diff --git a/packages/react-components/react-popover/src/components/Popover/Popover.test.tsx b/packages/react-components/react-popover/src/components/Popover/Popover.test.tsx index 504e87cfc320a7..680621a2dac2bf 100644 --- a/packages/react-components/react-popover/src/components/Popover/Popover.test.tsx +++ b/packages/react-components/react-popover/src/components/Popover/Popover.test.tsx @@ -2,7 +2,7 @@ import * as React from 'react'; import { Popover } from './Popover'; import { renderHook } from '@testing-library/react-hooks'; import { usePopover_unstable } from './usePopover'; -import { isConformant } from '../../common/isConformant'; +import { isConformant } from '../../testing/isConformant'; describe('Popover', () => { isConformant({ diff --git a/packages/react-components/react-popover/src/components/PopoverSurface/PopoverSurface.test.tsx b/packages/react-components/react-popover/src/components/PopoverSurface/PopoverSurface.test.tsx index 173b22b1abd567..275eba39f9e163 100644 --- a/packages/react-components/react-popover/src/components/PopoverSurface/PopoverSurface.test.tsx +++ b/packages/react-components/react-popover/src/components/PopoverSurface/PopoverSurface.test.tsx @@ -2,8 +2,8 @@ import { resetIdsForTests } from '@fluentui/react-utilities'; import * as React from 'react'; import { PopoverSurface } from './PopoverSurface'; import { render, fireEvent } from '@testing-library/react'; -import { isConformant } from '../../common/isConformant'; -import { mockPopoverContext } from '../../common/mockUsePopoverContext'; +import { isConformant } from '../../testing/isConformant'; +import { mockPopoverContext } from '../../testing/mockUsePopoverContext'; import { PopoverSurfaceProps } from './PopoverSurface.types'; jest.mock('../../popoverContext'); diff --git a/packages/react-components/react-popover/src/components/PopoverTrigger/PopoverTrigger.test.tsx b/packages/react-components/react-popover/src/components/PopoverTrigger/PopoverTrigger.test.tsx index e8e3fa5818d90c..21823e2282749b 100644 --- a/packages/react-components/react-popover/src/components/PopoverTrigger/PopoverTrigger.test.tsx +++ b/packages/react-components/react-popover/src/components/PopoverTrigger/PopoverTrigger.test.tsx @@ -2,8 +2,8 @@ import * as React from 'react'; import { render, fireEvent } from '@testing-library/react'; import { PopoverTrigger } from './PopoverTrigger'; import * as renderer from 'react-test-renderer'; -import { mockPopoverContext } from '../../common/mockUsePopoverContext'; -import { isConformant } from '../../common/isConformant'; +import { mockPopoverContext } from '../../testing/mockUsePopoverContext'; +import { isConformant } from '../../testing/isConformant'; jest.mock('../../popoverContext'); diff --git a/packages/react-components/react-popover/src/common/isConformant.ts b/packages/react-components/react-popover/src/testing/isConformant.ts similarity index 100% rename from packages/react-components/react-popover/src/common/isConformant.ts rename to packages/react-components/react-popover/src/testing/isConformant.ts diff --git a/packages/react-components/react-popover/src/common/mockUsePopoverContext.ts b/packages/react-components/react-popover/src/testing/mockUsePopoverContext.ts similarity index 100% rename from packages/react-components/react-popover/src/common/mockUsePopoverContext.ts rename to packages/react-components/react-popover/src/testing/mockUsePopoverContext.ts diff --git a/packages/react-components/react-popover/src/stories/Popover/PopoverAnchorToCustomTarget.stories.tsx b/packages/react-components/react-popover/stories/Popover/PopoverAnchorToCustomTarget.stories.tsx similarity index 100% rename from packages/react-components/react-popover/src/stories/Popover/PopoverAnchorToCustomTarget.stories.tsx rename to packages/react-components/react-popover/stories/Popover/PopoverAnchorToCustomTarget.stories.tsx diff --git a/packages/react-components/react-popover/src/stories/Popover/PopoverAppearance.stories.tsx b/packages/react-components/react-popover/stories/Popover/PopoverAppearance.stories.tsx similarity index 100% rename from packages/react-components/react-popover/src/stories/Popover/PopoverAppearance.stories.tsx rename to packages/react-components/react-popover/stories/Popover/PopoverAppearance.stories.tsx diff --git a/packages/react-components/react-popover/src/stories/Popover/PopoverBestPractices.md b/packages/react-components/react-popover/stories/Popover/PopoverBestPractices.md similarity index 100% rename from packages/react-components/react-popover/src/stories/Popover/PopoverBestPractices.md rename to packages/react-components/react-popover/stories/Popover/PopoverBestPractices.md diff --git a/packages/react-components/react-popover/src/stories/Popover/PopoverControllingOpenAndClose.stories.tsx b/packages/react-components/react-popover/stories/Popover/PopoverControllingOpenAndClose.stories.tsx similarity index 100% rename from packages/react-components/react-popover/src/stories/Popover/PopoverControllingOpenAndClose.stories.tsx rename to packages/react-components/react-popover/stories/Popover/PopoverControllingOpenAndClose.stories.tsx diff --git a/packages/react-components/react-popover/src/stories/Popover/PopoverCustomTrigger.stories.tsx b/packages/react-components/react-popover/stories/Popover/PopoverCustomTrigger.stories.tsx similarity index 100% rename from packages/react-components/react-popover/src/stories/Popover/PopoverCustomTrigger.stories.tsx rename to packages/react-components/react-popover/stories/Popover/PopoverCustomTrigger.stories.tsx diff --git a/packages/react-components/react-popover/src/stories/Popover/PopoverDefault.stories.tsx b/packages/react-components/react-popover/stories/Popover/PopoverDefault.stories.tsx similarity index 100% rename from packages/react-components/react-popover/src/stories/Popover/PopoverDefault.stories.tsx rename to packages/react-components/react-popover/stories/Popover/PopoverDefault.stories.tsx diff --git a/packages/react-components/react-popover/src/stories/Popover/PopoverDescription.md b/packages/react-components/react-popover/stories/Popover/PopoverDescription.md similarity index 100% rename from packages/react-components/react-popover/src/stories/Popover/PopoverDescription.md rename to packages/react-components/react-popover/stories/Popover/PopoverDescription.md diff --git a/packages/react-components/react-popover/src/stories/Popover/PopoverInternalUpdateContent.stories.tsx b/packages/react-components/react-popover/stories/Popover/PopoverInternalUpdateContent.stories.tsx similarity index 100% rename from packages/react-components/react-popover/src/stories/Popover/PopoverInternalUpdateContent.stories.tsx rename to packages/react-components/react-popover/stories/Popover/PopoverInternalUpdateContent.stories.tsx diff --git a/packages/react-components/react-popover/src/stories/Popover/PopoverNestedPopovers.stories.tsx b/packages/react-components/react-popover/stories/Popover/PopoverNestedPopovers.stories.tsx similarity index 100% rename from packages/react-components/react-popover/src/stories/Popover/PopoverNestedPopovers.stories.tsx rename to packages/react-components/react-popover/stories/Popover/PopoverNestedPopovers.stories.tsx diff --git a/packages/react-components/react-popover/src/stories/Popover/PopoverTrappingFocus.stories.tsx b/packages/react-components/react-popover/stories/Popover/PopoverTrappingFocus.stories.tsx similarity index 100% rename from packages/react-components/react-popover/src/stories/Popover/PopoverTrappingFocus.stories.tsx rename to packages/react-components/react-popover/stories/Popover/PopoverTrappingFocus.stories.tsx diff --git a/packages/react-components/react-popover/src/stories/Popover/PopoverWithArrow.stories.tsx b/packages/react-components/react-popover/stories/Popover/PopoverWithArrow.stories.tsx similarity index 100% rename from packages/react-components/react-popover/src/stories/Popover/PopoverWithArrow.stories.tsx rename to packages/react-components/react-popover/stories/Popover/PopoverWithArrow.stories.tsx diff --git a/packages/react-components/react-popover/src/stories/Popover/index.stories.tsx b/packages/react-components/react-popover/stories/Popover/index.stories.tsx similarity index 100% rename from packages/react-components/react-popover/src/stories/Popover/index.stories.tsx rename to packages/react-components/react-popover/stories/Popover/index.stories.tsx diff --git a/packages/react-components/react-popover/e2e/tsconfig.json b/packages/react-components/react-popover/tsconfig.cy.json similarity index 70% rename from packages/react-components/react-popover/e2e/tsconfig.json rename to packages/react-components/react-popover/tsconfig.cy.json index f6b23b30d510ba..93a140885851da 100644 --- a/packages/react-components/react-popover/e2e/tsconfig.json +++ b/packages/react-components/react-popover/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-popover/tsconfig.json b/packages/react-components/react-popover/tsconfig.json index 9087bac77cc8d7..1317f81620ca5e 100644 --- a/packages/react-components/react-popover/tsconfig.json +++ b/packages/react-components/react-popover/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-popover/tsconfig.lib.json b/packages/react-components/react-popover/tsconfig.lib.json index 7f94e04299ed85..e17f808c039339 100644 --- a/packages/react-components/react-popover/tsconfig.lib.json +++ b/packages/react-components/react-popover/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-popover/tsconfig.spec.json b/packages/react-components/react-popover/tsconfig.spec.json index 469fcba4d7ba75..911456fe4b4d91 100644 --- a/packages/react-components/react-popover/tsconfig.spec.json +++ b/packages/react-components/react-popover/tsconfig.spec.json @@ -5,5 +5,13 @@ "outDir": "dist", "types": ["jest", "node"] }, - "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" + ] }