diff --git a/change/@fluentui-react-accordion-0a9e77fe-302b-41f7-aa05-a03188b9f869.json b/change/@fluentui-react-accordion-0a9e77fe-302b-41f7-aa05-a03188b9f869.json new file mode 100644 index 0000000000000..442f6580b5d3c --- /dev/null +++ b/change/@fluentui-react-accordion-0a9e77fe-302b-41f7-aa05-a03188b9f869.json @@ -0,0 +1,7 @@ +{ + "type": "patch", + "comment": "chore: Migrate to new package structure.", + "packageName": "@fluentui/react-accordion", + "email": "tristan.watanabe@gmail.com", + "dependentChangeType": "patch" +} diff --git a/packages/react-components/react-accordion/.npmignore b/packages/react-components/react-accordion/.npmignore index 52d2a7273a151..f7ce568a6dbf7 100644 --- a/packages/react-components/react-accordion/.npmignore +++ b/packages/react-components/react-accordion/.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-accordion/.storybook/main.js b/packages/react-components/react-accordion/.storybook/main.js index f57cfd09509e7..26536b61b387f 100644 --- a/packages/react-components/react-accordion/.storybook/main.js +++ b/packages/react-components/react-accordion/.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-accordion/.storybook/tsconfig.json b/packages/react-components/react-accordion/.storybook/tsconfig.json index f9f60e1234ed4..ea89218a3d916 100644 --- a/packages/react-components/react-accordion/.storybook/tsconfig.json +++ b/packages/react-components/react-accordion/.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-accordion/config/api-extractor.json b/packages/react-components/react-accordion/config/api-extractor.json index eee94ff6de902..637d9797ae3e6 100644 --- a/packages/react-components/react-accordion/config/api-extractor.json +++ b/packages/react-components/react-accordion/config/api-extractor.json @@ -1,5 +1,9 @@ { "$schema": "https://developer.microsoft.com/json-schemas/api-extractor/v7/api-extractor.schema.json", "extends": "@fluentui/scripts/api-extractor/api-extractor.common.v-next.json", - "mainEntryPointFilePath": "/dist/types/index.d.ts" + "dtsRollup": { + "enabled": true, + "untrimmedFilePath": "", + "publicTrimmedFilePath": "/dist/index.d.ts" + } } diff --git a/packages/react-components/react-accordion/config/api-extractor.local.json b/packages/react-components/react-accordion/config/api-extractor.local.json deleted file mode 100644 index 69e764bce3a59..0000000000000 --- a/packages/react-components/react-accordion/config/api-extractor.local.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "$schema": "https://developer.microsoft.com/json-schemas/api-extractor/v7/api-extractor.schema.json", - "extends": "./api-extractor.json", - "mainEntryPointFilePath": "/dist/types/packages/react-components//src/index.d.ts" -} diff --git a/packages/react-components/react-accordion/Spec.md b/packages/react-components/react-accordion/docs/Spec.md similarity index 100% rename from packages/react-components/react-accordion/Spec.md rename to packages/react-components/react-accordion/docs/Spec.md diff --git a/packages/react-components/react-accordion/package.json b/packages/react-components/react-accordion/package.json index 4452e030d3245..92b929aab6494 100644 --- a/packages/react-components/react-accordion/package.json +++ b/packages/react-components/react-accordion/package.json @@ -4,7 +4,7 @@ "description": "Fluent UI accordion 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", @@ -20,10 +20,9 @@ "lint": "just-scripts lint", "start": "yarn storybook", "test": "jest --passWithNoTests", - "docs": "api-extractor run --config=config/api-extractor.local.json --local", - "build:local": "tsc -p ./tsconfig.lib.json --module esnext --emitDeclarationOnly && node ../../../scripts/typescript/normalize-import --output ./dist/types/packages/react-components/react-accordion/src && yarn docs", "storybook": "start-storybook", - "type-check": "tsc -b tsconfig.json" + "type-check": "tsc -b tsconfig.json", + "generate-api": "tsc -p ./tsconfig.lib.json --emitDeclarationOnly && just-scripts api-extractor" }, "devDependencies": { "@fluentui/eslint-plugin": "*", @@ -57,9 +56,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-accordion/src/components/Accordion/Accordion.test.tsx b/packages/react-components/react-accordion/src/components/Accordion/Accordion.test.tsx index d5216f292cdde..def3024647095 100644 --- a/packages/react-components/react-accordion/src/components/Accordion/Accordion.test.tsx +++ b/packages/react-components/react-accordion/src/components/Accordion/Accordion.test.tsx @@ -1,7 +1,7 @@ import * as React from 'react'; import { Accordion } from './Accordion'; import * as renderer from 'react-test-renderer'; -import { isConformant } from '../../common/isConformant'; +import { isConformant } from '../../testing/isConformant'; describe('Accordion', () => { isConformant({ diff --git a/packages/react-components/react-accordion/src/components/AccordionHeader/AccordionHeader.test.tsx b/packages/react-components/react-accordion/src/components/AccordionHeader/AccordionHeader.test.tsx index 625f2398a0434..1f56f855a898d 100644 --- a/packages/react-components/react-accordion/src/components/AccordionHeader/AccordionHeader.test.tsx +++ b/packages/react-components/react-accordion/src/components/AccordionHeader/AccordionHeader.test.tsx @@ -3,7 +3,7 @@ import * as React from 'react'; import { AccordionHeader } from './AccordionHeader'; import { AccordionHeaderProps } from './AccordionHeader.types'; import * as renderer from 'react-test-renderer'; -import { isConformant } from '../../common/isConformant'; +import { isConformant } from '../../testing/isConformant'; import { Accordion } from '../Accordion/Accordion'; import { AccordionItem } from '../AccordionItem'; import { AccordionPanel } from '../AccordionPanel'; diff --git a/packages/react-components/react-accordion/src/components/AccordionItem/AccordionItem.test.tsx b/packages/react-components/react-accordion/src/components/AccordionItem/AccordionItem.test.tsx index 6da9384d908b8..4962891a8d864 100644 --- a/packages/react-components/react-accordion/src/components/AccordionItem/AccordionItem.test.tsx +++ b/packages/react-components/react-accordion/src/components/AccordionItem/AccordionItem.test.tsx @@ -1,7 +1,7 @@ import * as React from 'react'; import { AccordionItem } from './AccordionItem'; import * as renderer from 'react-test-renderer'; -import { isConformant } from '../../common/isConformant'; +import { isConformant } from '../../testing/isConformant'; describe('AccordionItem', () => { isConformant({ diff --git a/packages/react-components/react-accordion/src/components/AccordionPanel/AccordionPanel.test.tsx b/packages/react-components/react-accordion/src/components/AccordionPanel/AccordionPanel.test.tsx index 004cf68dc4ac0..90ecce32f3f97 100644 --- a/packages/react-components/react-accordion/src/components/AccordionPanel/AccordionPanel.test.tsx +++ b/packages/react-components/react-accordion/src/components/AccordionPanel/AccordionPanel.test.tsx @@ -1,7 +1,7 @@ import * as React from 'react'; import { AccordionPanel } from './AccordionPanel'; import * as renderer from 'react-test-renderer'; -import { isConformant } from '../../common/isConformant'; +import { isConformant } from '../../testing/isConformant'; import { AccordionItemContext } from '../AccordionItem'; describe('AccordionPanel', () => { diff --git a/packages/react-components/react-accordion/src/common/isConformant.ts b/packages/react-components/react-accordion/src/testing/isConformant.ts similarity index 100% rename from packages/react-components/react-accordion/src/common/isConformant.ts rename to packages/react-components/react-accordion/src/testing/isConformant.ts diff --git a/packages/react-components/react-accordion/src/stories/Accordion/AccordionCollapsible.stories.tsx b/packages/react-components/react-accordion/stories/Accordion/AccordionCollapsible.stories.tsx similarity index 100% rename from packages/react-components/react-accordion/src/stories/Accordion/AccordionCollapsible.stories.tsx rename to packages/react-components/react-accordion/stories/Accordion/AccordionCollapsible.stories.tsx diff --git a/packages/react-components/react-accordion/src/stories/Accordion/AccordionDefault.stories.tsx b/packages/react-components/react-accordion/stories/Accordion/AccordionDefault.stories.tsx similarity index 100% rename from packages/react-components/react-accordion/src/stories/Accordion/AccordionDefault.stories.tsx rename to packages/react-components/react-accordion/stories/Accordion/AccordionDefault.stories.tsx diff --git a/packages/react-components/react-accordion/src/stories/Accordion/AccordionDescription.md b/packages/react-components/react-accordion/stories/Accordion/AccordionDescription.md similarity index 100% rename from packages/react-components/react-accordion/src/stories/Accordion/AccordionDescription.md rename to packages/react-components/react-accordion/stories/Accordion/AccordionDescription.md diff --git a/packages/react-components/react-accordion/src/stories/Accordion/AccordionDisabled.stories.tsx b/packages/react-components/react-accordion/stories/Accordion/AccordionDisabled.stories.tsx similarity index 100% rename from packages/react-components/react-accordion/src/stories/Accordion/AccordionDisabled.stories.tsx rename to packages/react-components/react-accordion/stories/Accordion/AccordionDisabled.stories.tsx diff --git a/packages/react-components/react-accordion/src/stories/Accordion/AccordionExpandIcon.stories.tsx b/packages/react-components/react-accordion/stories/Accordion/AccordionExpandIcon.stories.tsx similarity index 100% rename from packages/react-components/react-accordion/src/stories/Accordion/AccordionExpandIcon.stories.tsx rename to packages/react-components/react-accordion/stories/Accordion/AccordionExpandIcon.stories.tsx diff --git a/packages/react-components/react-accordion/src/stories/Accordion/AccordionExpandIconPosition.stories.tsx b/packages/react-components/react-accordion/stories/Accordion/AccordionExpandIconPosition.stories.tsx similarity index 100% rename from packages/react-components/react-accordion/src/stories/Accordion/AccordionExpandIconPosition.stories.tsx rename to packages/react-components/react-accordion/stories/Accordion/AccordionExpandIconPosition.stories.tsx diff --git a/packages/react-components/react-accordion/src/stories/Accordion/AccordionHeaders.stories.tsx b/packages/react-components/react-accordion/stories/Accordion/AccordionHeaders.stories.tsx similarity index 100% rename from packages/react-components/react-accordion/src/stories/Accordion/AccordionHeaders.stories.tsx rename to packages/react-components/react-accordion/stories/Accordion/AccordionHeaders.stories.tsx diff --git a/packages/react-components/react-accordion/src/stories/Accordion/AccordionInline.stories.tsx b/packages/react-components/react-accordion/stories/Accordion/AccordionInline.stories.tsx similarity index 100% rename from packages/react-components/react-accordion/src/stories/Accordion/AccordionInline.stories.tsx rename to packages/react-components/react-accordion/stories/Accordion/AccordionInline.stories.tsx diff --git a/packages/react-components/react-accordion/src/stories/Accordion/AccordionMultiple.stories.tsx b/packages/react-components/react-accordion/stories/Accordion/AccordionMultiple.stories.tsx similarity index 100% rename from packages/react-components/react-accordion/src/stories/Accordion/AccordionMultiple.stories.tsx rename to packages/react-components/react-accordion/stories/Accordion/AccordionMultiple.stories.tsx diff --git a/packages/react-components/react-accordion/src/stories/Accordion/AccordionNavigation.stories.tsx b/packages/react-components/react-accordion/stories/Accordion/AccordionNavigation.stories.tsx similarity index 100% rename from packages/react-components/react-accordion/src/stories/Accordion/AccordionNavigation.stories.tsx rename to packages/react-components/react-accordion/stories/Accordion/AccordionNavigation.stories.tsx diff --git a/packages/react-components/react-accordion/src/stories/Accordion/AccordionOpenItems.stories.tsx b/packages/react-components/react-accordion/stories/Accordion/AccordionOpenItems.stories.tsx similarity index 100% rename from packages/react-components/react-accordion/src/stories/Accordion/AccordionOpenItems.stories.tsx rename to packages/react-components/react-accordion/stories/Accordion/AccordionOpenItems.stories.tsx diff --git a/packages/react-components/react-accordion/src/stories/Accordion/AccordionSizes.stories.tsx b/packages/react-components/react-accordion/stories/Accordion/AccordionSizes.stories.tsx similarity index 100% rename from packages/react-components/react-accordion/src/stories/Accordion/AccordionSizes.stories.tsx rename to packages/react-components/react-accordion/stories/Accordion/AccordionSizes.stories.tsx diff --git a/packages/react-components/react-accordion/src/stories/Accordion/AccordionWithIcon.stories.tsx b/packages/react-components/react-accordion/stories/Accordion/AccordionWithIcon.stories.tsx similarity index 100% rename from packages/react-components/react-accordion/src/stories/Accordion/AccordionWithIcon.stories.tsx rename to packages/react-components/react-accordion/stories/Accordion/AccordionWithIcon.stories.tsx diff --git a/packages/react-components/react-accordion/src/stories/Accordion/index.stories.tsx b/packages/react-components/react-accordion/stories/Accordion/index.stories.tsx similarity index 100% rename from packages/react-components/react-accordion/src/stories/Accordion/index.stories.tsx rename to packages/react-components/react-accordion/stories/Accordion/index.stories.tsx diff --git a/packages/react-components/react-accordion/tsconfig.lib.json b/packages/react-components/react-accordion/tsconfig.lib.json index 5d7b14f1e0b70..6f90cf95c005b 100644 --- a/packages/react-components/react-accordion/tsconfig.lib.json +++ b/packages/react-components/react-accordion/tsconfig.lib.json @@ -3,14 +3,14 @@ "compilerOptions": { "noEmit": false, "lib": ["ES2019", "dom"], - "outDir": "dist", "declaration": true, - "declarationDir": "dist/types", + "declarationDir": "../../../dist/out-tsc/types", + "outDir": "../../../dist/out-tsc", "inlineSources": true, "types": ["static-assets", "environment"] }, "exclude": [ - "./src/common/**", + "./src/testing/**", "**/*.spec.ts", "**/*.spec.tsx", "**/*.test.ts", diff --git a/packages/react-components/react-accordion/tsconfig.spec.json b/packages/react-components/react-accordion/tsconfig.spec.json index 469fcba4d7ba7..911456fe4b4d9 100644 --- a/packages/react-components/react-accordion/tsconfig.spec.json +++ b/packages/react-components/react-accordion/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" + ] }