From ba2388405b06f31b1e117ea434ba97b3619b8df8 Mon Sep 17 00:00:00 2001 From: Tristan Watanabe Date: Sun, 20 Nov 2022 08:24:21 -0800 Subject: [PATCH 1/2] chore: run migration generator --- packages/react-components/react-spinner/.npmignore | 5 +++-- .../react-components/react-spinner/.storybook/main.js | 2 +- .../react-spinner/.storybook/tsconfig.json | 2 +- .../react-spinner/{ => docs}/MIGRATION.md | 0 .../react-components/react-spinner/{ => docs}/Spec.md | 0 .../src/components/Spinner/Spinner.test.tsx | 2 +- .../src/{common => testing}/isConformant.ts | 0 .../stories/Spinner/SpinnerAppearance.stories.tsx | 0 .../{src => }/stories/Spinner/SpinnerBestPractices.md | 0 .../stories/Spinner/SpinnerDefault.stories.tsx | 0 .../{src => }/stories/Spinner/SpinnerDescription.md | 0 .../{src => }/stories/Spinner/SpinnerLabel.stories.tsx | 0 .../{src => }/stories/Spinner/SpinnerSize.stories.tsx | 0 .../{src => }/stories/Spinner/index.stories.tsx | 0 .../react-components/react-spinner/tsconfig.lib.json | 2 +- .../react-components/react-spinner/tsconfig.spec.json | 10 +++++++++- 16 files changed, 16 insertions(+), 7 deletions(-) rename packages/react-components/react-spinner/{ => docs}/MIGRATION.md (100%) rename packages/react-components/react-spinner/{ => docs}/Spec.md (100%) rename packages/react-components/react-spinner/src/{common => testing}/isConformant.ts (100%) rename packages/react-components/react-spinner/{src => }/stories/Spinner/SpinnerAppearance.stories.tsx (100%) rename packages/react-components/react-spinner/{src => }/stories/Spinner/SpinnerBestPractices.md (100%) rename packages/react-components/react-spinner/{src => }/stories/Spinner/SpinnerDefault.stories.tsx (100%) rename packages/react-components/react-spinner/{src => }/stories/Spinner/SpinnerDescription.md (100%) rename packages/react-components/react-spinner/{src => }/stories/Spinner/SpinnerLabel.stories.tsx (100%) rename packages/react-components/react-spinner/{src => }/stories/Spinner/SpinnerSize.stories.tsx (100%) rename packages/react-components/react-spinner/{src => }/stories/Spinner/index.stories.tsx (100%) diff --git a/packages/react-components/react-spinner/.npmignore b/packages/react-components/react-spinner/.npmignore index 52d2a7273a151..f7ce568a6dbf7 100644 --- a/packages/react-components/react-spinner/.npmignore +++ b/packages/react-components/react-spinner/.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-spinner/.storybook/main.js b/packages/react-components/react-spinner/.storybook/main.js index f57cfd09509e7..26536b61b387f 100644 --- a/packages/react-components/react-spinner/.storybook/main.js +++ b/packages/react-components/react-spinner/.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-spinner/.storybook/tsconfig.json b/packages/react-components/react-spinner/.storybook/tsconfig.json index f9f60e1234ed4..ea89218a3d916 100644 --- a/packages/react-components/react-spinner/.storybook/tsconfig.json +++ b/packages/react-components/react-spinner/.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-spinner/MIGRATION.md b/packages/react-components/react-spinner/docs/MIGRATION.md similarity index 100% rename from packages/react-components/react-spinner/MIGRATION.md rename to packages/react-components/react-spinner/docs/MIGRATION.md diff --git a/packages/react-components/react-spinner/Spec.md b/packages/react-components/react-spinner/docs/Spec.md similarity index 100% rename from packages/react-components/react-spinner/Spec.md rename to packages/react-components/react-spinner/docs/Spec.md diff --git a/packages/react-components/react-spinner/src/components/Spinner/Spinner.test.tsx b/packages/react-components/react-spinner/src/components/Spinner/Spinner.test.tsx index 16edd1bb00f22..32a16b2f24873 100644 --- a/packages/react-components/react-spinner/src/components/Spinner/Spinner.test.tsx +++ b/packages/react-components/react-spinner/src/components/Spinner/Spinner.test.tsx @@ -1,7 +1,7 @@ import * as React from 'react'; import { render } from '@testing-library/react'; import { Spinner } from './Spinner'; -import { isConformant } from '../../common/isConformant'; +import { isConformant } from '../../testing/isConformant'; describe('Spinner', () => { isConformant({ diff --git a/packages/react-components/react-spinner/src/common/isConformant.ts b/packages/react-components/react-spinner/src/testing/isConformant.ts similarity index 100% rename from packages/react-components/react-spinner/src/common/isConformant.ts rename to packages/react-components/react-spinner/src/testing/isConformant.ts diff --git a/packages/react-components/react-spinner/src/stories/Spinner/SpinnerAppearance.stories.tsx b/packages/react-components/react-spinner/stories/Spinner/SpinnerAppearance.stories.tsx similarity index 100% rename from packages/react-components/react-spinner/src/stories/Spinner/SpinnerAppearance.stories.tsx rename to packages/react-components/react-spinner/stories/Spinner/SpinnerAppearance.stories.tsx diff --git a/packages/react-components/react-spinner/src/stories/Spinner/SpinnerBestPractices.md b/packages/react-components/react-spinner/stories/Spinner/SpinnerBestPractices.md similarity index 100% rename from packages/react-components/react-spinner/src/stories/Spinner/SpinnerBestPractices.md rename to packages/react-components/react-spinner/stories/Spinner/SpinnerBestPractices.md diff --git a/packages/react-components/react-spinner/src/stories/Spinner/SpinnerDefault.stories.tsx b/packages/react-components/react-spinner/stories/Spinner/SpinnerDefault.stories.tsx similarity index 100% rename from packages/react-components/react-spinner/src/stories/Spinner/SpinnerDefault.stories.tsx rename to packages/react-components/react-spinner/stories/Spinner/SpinnerDefault.stories.tsx diff --git a/packages/react-components/react-spinner/src/stories/Spinner/SpinnerDescription.md b/packages/react-components/react-spinner/stories/Spinner/SpinnerDescription.md similarity index 100% rename from packages/react-components/react-spinner/src/stories/Spinner/SpinnerDescription.md rename to packages/react-components/react-spinner/stories/Spinner/SpinnerDescription.md diff --git a/packages/react-components/react-spinner/src/stories/Spinner/SpinnerLabel.stories.tsx b/packages/react-components/react-spinner/stories/Spinner/SpinnerLabel.stories.tsx similarity index 100% rename from packages/react-components/react-spinner/src/stories/Spinner/SpinnerLabel.stories.tsx rename to packages/react-components/react-spinner/stories/Spinner/SpinnerLabel.stories.tsx diff --git a/packages/react-components/react-spinner/src/stories/Spinner/SpinnerSize.stories.tsx b/packages/react-components/react-spinner/stories/Spinner/SpinnerSize.stories.tsx similarity index 100% rename from packages/react-components/react-spinner/src/stories/Spinner/SpinnerSize.stories.tsx rename to packages/react-components/react-spinner/stories/Spinner/SpinnerSize.stories.tsx diff --git a/packages/react-components/react-spinner/src/stories/Spinner/index.stories.tsx b/packages/react-components/react-spinner/stories/Spinner/index.stories.tsx similarity index 100% rename from packages/react-components/react-spinner/src/stories/Spinner/index.stories.tsx rename to packages/react-components/react-spinner/stories/Spinner/index.stories.tsx diff --git a/packages/react-components/react-spinner/tsconfig.lib.json b/packages/react-components/react-spinner/tsconfig.lib.json index 7f94e04299ed8..6f90cf95c005b 100644 --- a/packages/react-components/react-spinner/tsconfig.lib.json +++ b/packages/react-components/react-spinner/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-spinner/tsconfig.spec.json b/packages/react-components/react-spinner/tsconfig.spec.json index 469fcba4d7ba7..911456fe4b4d9 100644 --- a/packages/react-components/react-spinner/tsconfig.spec.json +++ b/packages/react-components/react-spinner/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 e03175ab015618ac81e6c5d5969b8df1b96a1b97 Mon Sep 17 00:00:00 2001 From: Tristan Watanabe Date: Sun, 20 Nov 2022 08:25:38 -0800 Subject: [PATCH 2/2] Change File --- ...react-spinner-8921aff1-2f25-426f-99dd-89372a2d6c7c.json | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 change/@fluentui-react-spinner-8921aff1-2f25-426f-99dd-89372a2d6c7c.json diff --git a/change/@fluentui-react-spinner-8921aff1-2f25-426f-99dd-89372a2d6c7c.json b/change/@fluentui-react-spinner-8921aff1-2f25-426f-99dd-89372a2d6c7c.json new file mode 100644 index 0000000000000..130b0098ba9e0 --- /dev/null +++ b/change/@fluentui-react-spinner-8921aff1-2f25-426f-99dd-89372a2d6c7c.json @@ -0,0 +1,7 @@ +{ + "type": "patch", + "comment": "chore: Migrate to new package structure.", + "packageName": "@fluentui/react-spinner", + "email": "tristan.watanabe@gmail.com", + "dependentChangeType": "patch" +}