From 15d0046824a9daa06f5cb3c7a8071520dd8fe45c Mon Sep 17 00:00:00 2001 From: Tristan Watanabe Date: Sun, 20 Nov 2022 08:16:08 -0800 Subject: [PATCH 1/3] chore: run migration generator --- packages/react-components/react-spinbutton/.npmignore | 5 +++-- .../react-spinbutton/.storybook/main.js | 2 +- .../react-spinbutton/.storybook/tsconfig.json | 2 +- .../react-spinbutton/{ => docs}/Spec.md | 0 .../src/components/SpinButton/SpinButton.test.tsx | 2 +- .../SpinButtonField/SpinButtonField.test.tsx | 2 +- .../src/{common => testing}/isConformant.ts | 0 .../SpinButton/SpinButtonAccessibility.stories.mdx | 0 .../SpinButton/SpinButtonAppearance.stories.tsx | 0 .../stories/SpinButton/SpinButtonBestPractices.md | 0 .../stories/SpinButton/SpinButtonBounds.stories.tsx | 0 .../SpinButton/SpinButtonControlled.stories.tsx | 0 .../stories/SpinButton/SpinButtonDefault.stories.tsx | 0 .../stories/SpinButton/SpinButtonDescription.md | 0 .../stories/SpinButton/SpinButtonDisabled.stories.tsx | 0 .../SpinButton/SpinButtonDisplayValue.stories.tsx | 0 .../stories/SpinButton/SpinButtonSize.stories.tsx | 0 .../stories/SpinButton/SpinButtonStep.stories.tsx | 0 .../SpinButton/SpinButtonUncontrolled.stories.tsx | 0 .../{src => }/stories/SpinButton/index.stories.tsx | 0 .../SpinButtonField/SpinButtonFieldDefault.stories.tsx | 0 .../SpinButtonField/SpinButtonFieldDescription.md | 0 .../stories/SpinButtonField/index.stories.tsx | 0 .../react-spinbutton/tsconfig.lib.json | 2 +- .../react-spinbutton/tsconfig.spec.json | 10 +++++++++- 25 files changed, 17 insertions(+), 8 deletions(-) rename packages/react-components/react-spinbutton/{ => docs}/Spec.md (100%) rename packages/react-components/react-spinbutton/src/{common => testing}/isConformant.ts (100%) rename packages/react-components/react-spinbutton/{src => }/stories/SpinButton/SpinButtonAccessibility.stories.mdx (100%) rename packages/react-components/react-spinbutton/{src => }/stories/SpinButton/SpinButtonAppearance.stories.tsx (100%) rename packages/react-components/react-spinbutton/{src => }/stories/SpinButton/SpinButtonBestPractices.md (100%) rename packages/react-components/react-spinbutton/{src => }/stories/SpinButton/SpinButtonBounds.stories.tsx (100%) rename packages/react-components/react-spinbutton/{src => }/stories/SpinButton/SpinButtonControlled.stories.tsx (100%) rename packages/react-components/react-spinbutton/{src => }/stories/SpinButton/SpinButtonDefault.stories.tsx (100%) rename packages/react-components/react-spinbutton/{src => }/stories/SpinButton/SpinButtonDescription.md (100%) rename packages/react-components/react-spinbutton/{src => }/stories/SpinButton/SpinButtonDisabled.stories.tsx (100%) rename packages/react-components/react-spinbutton/{src => }/stories/SpinButton/SpinButtonDisplayValue.stories.tsx (100%) rename packages/react-components/react-spinbutton/{src => }/stories/SpinButton/SpinButtonSize.stories.tsx (100%) rename packages/react-components/react-spinbutton/{src => }/stories/SpinButton/SpinButtonStep.stories.tsx (100%) rename packages/react-components/react-spinbutton/{src => }/stories/SpinButton/SpinButtonUncontrolled.stories.tsx (100%) rename packages/react-components/react-spinbutton/{src => }/stories/SpinButton/index.stories.tsx (100%) rename packages/react-components/react-spinbutton/{src => }/stories/SpinButtonField/SpinButtonFieldDefault.stories.tsx (100%) rename packages/react-components/react-spinbutton/{src => }/stories/SpinButtonField/SpinButtonFieldDescription.md (100%) rename packages/react-components/react-spinbutton/{src => }/stories/SpinButtonField/index.stories.tsx (100%) diff --git a/packages/react-components/react-spinbutton/.npmignore b/packages/react-components/react-spinbutton/.npmignore index 52d2a7273a151..f7ce568a6dbf7 100644 --- a/packages/react-components/react-spinbutton/.npmignore +++ b/packages/react-components/react-spinbutton/.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-spinbutton/.storybook/main.js b/packages/react-components/react-spinbutton/.storybook/main.js index f57cfd09509e7..26536b61b387f 100644 --- a/packages/react-components/react-spinbutton/.storybook/main.js +++ b/packages/react-components/react-spinbutton/.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-spinbutton/.storybook/tsconfig.json b/packages/react-components/react-spinbutton/.storybook/tsconfig.json index f9f60e1234ed4..ea89218a3d916 100644 --- a/packages/react-components/react-spinbutton/.storybook/tsconfig.json +++ b/packages/react-components/react-spinbutton/.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-spinbutton/Spec.md b/packages/react-components/react-spinbutton/docs/Spec.md similarity index 100% rename from packages/react-components/react-spinbutton/Spec.md rename to packages/react-components/react-spinbutton/docs/Spec.md diff --git a/packages/react-components/react-spinbutton/src/components/SpinButton/SpinButton.test.tsx b/packages/react-components/react-spinbutton/src/components/SpinButton/SpinButton.test.tsx index 043456953585e..33d2689a78166 100644 --- a/packages/react-components/react-spinbutton/src/components/SpinButton/SpinButton.test.tsx +++ b/packages/react-components/react-spinbutton/src/components/SpinButton/SpinButton.test.tsx @@ -2,7 +2,7 @@ import * as React from 'react'; import { fireEvent, render, screen } from '@testing-library/react'; import userEvent from '@testing-library/user-event'; import { SpinButton } from './SpinButton'; -import { isConformant } from '../../common/isConformant'; +import { isConformant } from '../../testing/isConformant'; import * as Keys from '@fluentui/keyboard-keys'; const getSpinButtonInput = (): HTMLInputElement => { diff --git a/packages/react-components/react-spinbutton/src/components/SpinButtonField/SpinButtonField.test.tsx b/packages/react-components/react-spinbutton/src/components/SpinButtonField/SpinButtonField.test.tsx index d78df05fd8423..e9994a769116b 100644 --- a/packages/react-components/react-spinbutton/src/components/SpinButtonField/SpinButtonField.test.tsx +++ b/packages/react-components/react-spinbutton/src/components/SpinButtonField/SpinButtonField.test.tsx @@ -1,4 +1,4 @@ -import { isConformant } from '../../common/isConformant'; +import { isConformant } from '../../testing/isConformant'; import { SpinButtonField } from './SpinButtonField'; describe('SpinButtonField', () => { diff --git a/packages/react-components/react-spinbutton/src/common/isConformant.ts b/packages/react-components/react-spinbutton/src/testing/isConformant.ts similarity index 100% rename from packages/react-components/react-spinbutton/src/common/isConformant.ts rename to packages/react-components/react-spinbutton/src/testing/isConformant.ts diff --git a/packages/react-components/react-spinbutton/src/stories/SpinButton/SpinButtonAccessibility.stories.mdx b/packages/react-components/react-spinbutton/stories/SpinButton/SpinButtonAccessibility.stories.mdx similarity index 100% rename from packages/react-components/react-spinbutton/src/stories/SpinButton/SpinButtonAccessibility.stories.mdx rename to packages/react-components/react-spinbutton/stories/SpinButton/SpinButtonAccessibility.stories.mdx diff --git a/packages/react-components/react-spinbutton/src/stories/SpinButton/SpinButtonAppearance.stories.tsx b/packages/react-components/react-spinbutton/stories/SpinButton/SpinButtonAppearance.stories.tsx similarity index 100% rename from packages/react-components/react-spinbutton/src/stories/SpinButton/SpinButtonAppearance.stories.tsx rename to packages/react-components/react-spinbutton/stories/SpinButton/SpinButtonAppearance.stories.tsx diff --git a/packages/react-components/react-spinbutton/src/stories/SpinButton/SpinButtonBestPractices.md b/packages/react-components/react-spinbutton/stories/SpinButton/SpinButtonBestPractices.md similarity index 100% rename from packages/react-components/react-spinbutton/src/stories/SpinButton/SpinButtonBestPractices.md rename to packages/react-components/react-spinbutton/stories/SpinButton/SpinButtonBestPractices.md diff --git a/packages/react-components/react-spinbutton/src/stories/SpinButton/SpinButtonBounds.stories.tsx b/packages/react-components/react-spinbutton/stories/SpinButton/SpinButtonBounds.stories.tsx similarity index 100% rename from packages/react-components/react-spinbutton/src/stories/SpinButton/SpinButtonBounds.stories.tsx rename to packages/react-components/react-spinbutton/stories/SpinButton/SpinButtonBounds.stories.tsx diff --git a/packages/react-components/react-spinbutton/src/stories/SpinButton/SpinButtonControlled.stories.tsx b/packages/react-components/react-spinbutton/stories/SpinButton/SpinButtonControlled.stories.tsx similarity index 100% rename from packages/react-components/react-spinbutton/src/stories/SpinButton/SpinButtonControlled.stories.tsx rename to packages/react-components/react-spinbutton/stories/SpinButton/SpinButtonControlled.stories.tsx diff --git a/packages/react-components/react-spinbutton/src/stories/SpinButton/SpinButtonDefault.stories.tsx b/packages/react-components/react-spinbutton/stories/SpinButton/SpinButtonDefault.stories.tsx similarity index 100% rename from packages/react-components/react-spinbutton/src/stories/SpinButton/SpinButtonDefault.stories.tsx rename to packages/react-components/react-spinbutton/stories/SpinButton/SpinButtonDefault.stories.tsx diff --git a/packages/react-components/react-spinbutton/src/stories/SpinButton/SpinButtonDescription.md b/packages/react-components/react-spinbutton/stories/SpinButton/SpinButtonDescription.md similarity index 100% rename from packages/react-components/react-spinbutton/src/stories/SpinButton/SpinButtonDescription.md rename to packages/react-components/react-spinbutton/stories/SpinButton/SpinButtonDescription.md diff --git a/packages/react-components/react-spinbutton/src/stories/SpinButton/SpinButtonDisabled.stories.tsx b/packages/react-components/react-spinbutton/stories/SpinButton/SpinButtonDisabled.stories.tsx similarity index 100% rename from packages/react-components/react-spinbutton/src/stories/SpinButton/SpinButtonDisabled.stories.tsx rename to packages/react-components/react-spinbutton/stories/SpinButton/SpinButtonDisabled.stories.tsx diff --git a/packages/react-components/react-spinbutton/src/stories/SpinButton/SpinButtonDisplayValue.stories.tsx b/packages/react-components/react-spinbutton/stories/SpinButton/SpinButtonDisplayValue.stories.tsx similarity index 100% rename from packages/react-components/react-spinbutton/src/stories/SpinButton/SpinButtonDisplayValue.stories.tsx rename to packages/react-components/react-spinbutton/stories/SpinButton/SpinButtonDisplayValue.stories.tsx diff --git a/packages/react-components/react-spinbutton/src/stories/SpinButton/SpinButtonSize.stories.tsx b/packages/react-components/react-spinbutton/stories/SpinButton/SpinButtonSize.stories.tsx similarity index 100% rename from packages/react-components/react-spinbutton/src/stories/SpinButton/SpinButtonSize.stories.tsx rename to packages/react-components/react-spinbutton/stories/SpinButton/SpinButtonSize.stories.tsx diff --git a/packages/react-components/react-spinbutton/src/stories/SpinButton/SpinButtonStep.stories.tsx b/packages/react-components/react-spinbutton/stories/SpinButton/SpinButtonStep.stories.tsx similarity index 100% rename from packages/react-components/react-spinbutton/src/stories/SpinButton/SpinButtonStep.stories.tsx rename to packages/react-components/react-spinbutton/stories/SpinButton/SpinButtonStep.stories.tsx diff --git a/packages/react-components/react-spinbutton/src/stories/SpinButton/SpinButtonUncontrolled.stories.tsx b/packages/react-components/react-spinbutton/stories/SpinButton/SpinButtonUncontrolled.stories.tsx similarity index 100% rename from packages/react-components/react-spinbutton/src/stories/SpinButton/SpinButtonUncontrolled.stories.tsx rename to packages/react-components/react-spinbutton/stories/SpinButton/SpinButtonUncontrolled.stories.tsx diff --git a/packages/react-components/react-spinbutton/src/stories/SpinButton/index.stories.tsx b/packages/react-components/react-spinbutton/stories/SpinButton/index.stories.tsx similarity index 100% rename from packages/react-components/react-spinbutton/src/stories/SpinButton/index.stories.tsx rename to packages/react-components/react-spinbutton/stories/SpinButton/index.stories.tsx diff --git a/packages/react-components/react-spinbutton/src/stories/SpinButtonField/SpinButtonFieldDefault.stories.tsx b/packages/react-components/react-spinbutton/stories/SpinButtonField/SpinButtonFieldDefault.stories.tsx similarity index 100% rename from packages/react-components/react-spinbutton/src/stories/SpinButtonField/SpinButtonFieldDefault.stories.tsx rename to packages/react-components/react-spinbutton/stories/SpinButtonField/SpinButtonFieldDefault.stories.tsx diff --git a/packages/react-components/react-spinbutton/src/stories/SpinButtonField/SpinButtonFieldDescription.md b/packages/react-components/react-spinbutton/stories/SpinButtonField/SpinButtonFieldDescription.md similarity index 100% rename from packages/react-components/react-spinbutton/src/stories/SpinButtonField/SpinButtonFieldDescription.md rename to packages/react-components/react-spinbutton/stories/SpinButtonField/SpinButtonFieldDescription.md diff --git a/packages/react-components/react-spinbutton/src/stories/SpinButtonField/index.stories.tsx b/packages/react-components/react-spinbutton/stories/SpinButtonField/index.stories.tsx similarity index 100% rename from packages/react-components/react-spinbutton/src/stories/SpinButtonField/index.stories.tsx rename to packages/react-components/react-spinbutton/stories/SpinButtonField/index.stories.tsx diff --git a/packages/react-components/react-spinbutton/tsconfig.lib.json b/packages/react-components/react-spinbutton/tsconfig.lib.json index 7f94e04299ed8..6f90cf95c005b 100644 --- a/packages/react-components/react-spinbutton/tsconfig.lib.json +++ b/packages/react-components/react-spinbutton/tsconfig.lib.json @@ -10,7 +10,7 @@ "types": ["static-assets", "environment"] }, "exclude": [ - "./src/common/**", + "./src/testing/**", "**/*.spec.ts", "**/*.spec.tsx", "**/*.test.ts", diff --git a/packages/react-components/react-spinbutton/tsconfig.spec.json b/packages/react-components/react-spinbutton/tsconfig.spec.json index 469fcba4d7ba7..911456fe4b4d9 100644 --- a/packages/react-components/react-spinbutton/tsconfig.spec.json +++ b/packages/react-components/react-spinbutton/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" + ] } From d2d45197034aa4072a54f1582b250ffaedc750a3 Mon Sep 17 00:00:00 2001 From: Tristan Watanabe Date: Sun, 20 Nov 2022 08:17:25 -0800 Subject: [PATCH 2/3] chore: move spec assets to docs subfolder and update paths --- .../react-components/react-spinbutton/docs/Spec.md | 6 +++--- .../spec-spinbutton-anatomy-alt-optional.png | Bin .../assets}/spec-spinbutton-anatomy.png | Bin .../assets}/spec-spinbutton-rtl.png | Bin 4 files changed, 3 insertions(+), 3 deletions(-) rename packages/react-components/react-spinbutton/{spec-assets => docs/assets}/spec-spinbutton-anatomy-alt-optional.png (100%) rename packages/react-components/react-spinbutton/{spec-assets => docs/assets}/spec-spinbutton-anatomy.png (100%) rename packages/react-components/react-spinbutton/{spec-assets => docs/assets}/spec-spinbutton-rtl.png (100%) diff --git a/packages/react-components/react-spinbutton/docs/Spec.md b/packages/react-components/react-spinbutton/docs/Spec.md index 0e6dfc2a4f603..6e2425e543330 100644 --- a/packages/react-components/react-spinbutton/docs/Spec.md +++ b/packages/react-components/react-spinbutton/docs/Spec.md @@ -41,11 +41,11 @@ Note that labels and helper text are included here for completeness but will be #### Base `SpinButton` Anatomy -![Base SpinButton Anatomy (annotated)](./spec-assets/spec-spinbutton-anatomy.png) +![Base SpinButton Anatomy (annotated)](./assets/spec-spinbutton-anatomy.png) #### Alternate/Optional `SpinButton` Anatomy -![Alternate/Optional SpinButton Anatomy (annotated)](./spec-assets/spec-spinbutton-anatomy-alt-optional.png) +![Alternate/Optional SpinButton Anatomy (annotated)](./assets/spec-spinbutton-anatomy-alt-optional.png) ### Common Features @@ -74,7 +74,7 @@ Unlike directly typing input into the control, step buttons do not allow input o Most implementations flip the layout of the control for RTL. Using the base example, the step buttons appear on the left with the value on the right as opposed to the LTR version where the value is on the left and the steppers on the right. -![Example of an RTL SpinButton](./spec-assets/spec-spinbutton-rtl.png) +![Example of an RTL SpinButton](./assets/spec-spinbutton-rtl.png) ### a11y diff --git a/packages/react-components/react-spinbutton/spec-assets/spec-spinbutton-anatomy-alt-optional.png b/packages/react-components/react-spinbutton/docs/assets/spec-spinbutton-anatomy-alt-optional.png similarity index 100% rename from packages/react-components/react-spinbutton/spec-assets/spec-spinbutton-anatomy-alt-optional.png rename to packages/react-components/react-spinbutton/docs/assets/spec-spinbutton-anatomy-alt-optional.png diff --git a/packages/react-components/react-spinbutton/spec-assets/spec-spinbutton-anatomy.png b/packages/react-components/react-spinbutton/docs/assets/spec-spinbutton-anatomy.png similarity index 100% rename from packages/react-components/react-spinbutton/spec-assets/spec-spinbutton-anatomy.png rename to packages/react-components/react-spinbutton/docs/assets/spec-spinbutton-anatomy.png diff --git a/packages/react-components/react-spinbutton/spec-assets/spec-spinbutton-rtl.png b/packages/react-components/react-spinbutton/docs/assets/spec-spinbutton-rtl.png similarity index 100% rename from packages/react-components/react-spinbutton/spec-assets/spec-spinbutton-rtl.png rename to packages/react-components/react-spinbutton/docs/assets/spec-spinbutton-rtl.png From 5fa7f02752d2b0ccc86d0e8517fcc69e322ca9ec Mon Sep 17 00:00:00 2001 From: Tristan Watanabe Date: Sun, 20 Nov 2022 08:18:52 -0800 Subject: [PATCH 3/3] Change File --- ...ct-spinbutton-d8538b20-21ca-421d-b2f0-f5302d8f56e2.json | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 change/@fluentui-react-spinbutton-d8538b20-21ca-421d-b2f0-f5302d8f56e2.json diff --git a/change/@fluentui-react-spinbutton-d8538b20-21ca-421d-b2f0-f5302d8f56e2.json b/change/@fluentui-react-spinbutton-d8538b20-21ca-421d-b2f0-f5302d8f56e2.json new file mode 100644 index 0000000000000..6aef118b9bdc5 --- /dev/null +++ b/change/@fluentui-react-spinbutton-d8538b20-21ca-421d-b2f0-f5302d8f56e2.json @@ -0,0 +1,7 @@ +{ + "type": "patch", + "comment": "chore: Migrate to new package structure.", + "packageName": "@fluentui/react-spinbutton", + "email": "tristan.watanabe@gmail.com", + "dependentChangeType": "patch" +}