From 9ba6a2e35cb5991a368aa83cab5cb432f5ed5314 Mon Sep 17 00:00:00 2001 From: Tristan Watanabe Date: Tue, 1 Nov 2022 17:47:19 -0700 Subject: [PATCH 1/6] chore(react-portal): run migration generator --- packages/react-components/react-portal/.npmignore | 5 +++-- .../react-components/react-portal/.storybook/main.js | 2 +- .../react-portal/.storybook/tsconfig.json | 2 +- .../react-components/react-portal/{ => docs}/Spec.md | 0 .../{src => }/stories/Portal/PortalDefault.stories.tsx | 0 .../{src => }/stories/Portal/PortalDescription.md | 0 .../{src => }/stories/Portal/index.stories.tsx | 0 .../react-components/react-portal/tsconfig.spec.json | 10 +++++++++- 8 files changed, 14 insertions(+), 5 deletions(-) rename packages/react-components/react-portal/{ => docs}/Spec.md (100%) rename packages/react-components/react-portal/{src => }/stories/Portal/PortalDefault.stories.tsx (100%) rename packages/react-components/react-portal/{src => }/stories/Portal/PortalDescription.md (100%) rename packages/react-components/react-portal/{src => }/stories/Portal/index.stories.tsx (100%) diff --git a/packages/react-components/react-portal/.npmignore b/packages/react-components/react-portal/.npmignore index 52d2a7273a151d..f7ce568a6dbf7c 100644 --- a/packages/react-components/react-portal/.npmignore +++ b/packages/react-components/react-portal/.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-portal/.storybook/main.js b/packages/react-components/react-portal/.storybook/main.js index f57cfd09509e78..26536b61b387f6 100644 --- a/packages/react-components/react-portal/.storybook/main.js +++ b/packages/react-components/react-portal/.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-portal/.storybook/tsconfig.json b/packages/react-components/react-portal/.storybook/tsconfig.json index f9f60e1234ed49..ea89218a3d916f 100644 --- a/packages/react-components/react-portal/.storybook/tsconfig.json +++ b/packages/react-components/react-portal/.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-portal/Spec.md b/packages/react-components/react-portal/docs/Spec.md similarity index 100% rename from packages/react-components/react-portal/Spec.md rename to packages/react-components/react-portal/docs/Spec.md diff --git a/packages/react-components/react-portal/src/stories/Portal/PortalDefault.stories.tsx b/packages/react-components/react-portal/stories/Portal/PortalDefault.stories.tsx similarity index 100% rename from packages/react-components/react-portal/src/stories/Portal/PortalDefault.stories.tsx rename to packages/react-components/react-portal/stories/Portal/PortalDefault.stories.tsx diff --git a/packages/react-components/react-portal/src/stories/Portal/PortalDescription.md b/packages/react-components/react-portal/stories/Portal/PortalDescription.md similarity index 100% rename from packages/react-components/react-portal/src/stories/Portal/PortalDescription.md rename to packages/react-components/react-portal/stories/Portal/PortalDescription.md diff --git a/packages/react-components/react-portal/src/stories/Portal/index.stories.tsx b/packages/react-components/react-portal/stories/Portal/index.stories.tsx similarity index 100% rename from packages/react-components/react-portal/src/stories/Portal/index.stories.tsx rename to packages/react-components/react-portal/stories/Portal/index.stories.tsx diff --git a/packages/react-components/react-portal/tsconfig.spec.json b/packages/react-components/react-portal/tsconfig.spec.json index 11f8254e711f4c..0e881941843de8 100644 --- a/packages/react-components/react-portal/tsconfig.spec.json +++ b/packages/react-components/react-portal/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" + ] } From ef737d2ab8a7fe469aa27ffe3be4bf67a4ef2f41 Mon Sep 17 00:00:00 2001 From: Tristan Watanabe Date: Tue, 1 Nov 2022 17:51:49 -0700 Subject: [PATCH 2/6] chore(react-portal-compat): run migration generator --- .../react-components/react-portal-compat/.npmignore | 5 +++-- .../PortalCompat.e2e.tsx => src/PortalCompat.cy.tsx} | 2 +- .../{e2e/tsconfig.json => tsconfig.cy.json} | 4 ++-- .../react-components/react-portal-compat/tsconfig.json | 3 +++ .../react-portal-compat/tsconfig.lib.json | 2 +- .../react-portal-compat/tsconfig.spec.json | 10 +++++++++- 6 files changed, 19 insertions(+), 7 deletions(-) rename packages/react-components/react-portal-compat/{e2e/PortalCompat.e2e.tsx => src/PortalCompat.cy.tsx} (93%) rename packages/react-components/react-portal-compat/{e2e/tsconfig.json => tsconfig.cy.json} (70%) diff --git a/packages/react-components/react-portal-compat/.npmignore b/packages/react-components/react-portal-compat/.npmignore index 52d2a7273a151d..f7ce568a6dbf7c 100644 --- a/packages/react-components/react-portal-compat/.npmignore +++ b/packages/react-components/react-portal-compat/.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-portal-compat/e2e/PortalCompat.e2e.tsx b/packages/react-components/react-portal-compat/src/PortalCompat.cy.tsx similarity index 93% rename from packages/react-components/react-portal-compat/e2e/PortalCompat.e2e.tsx rename to packages/react-components/react-portal-compat/src/PortalCompat.cy.tsx index 5d77c57cef59f9..1781f72c66bdf7 100644 --- a/packages/react-components/react-portal-compat/e2e/PortalCompat.e2e.tsx +++ b/packages/react-components/react-portal-compat/src/PortalCompat.cy.tsx @@ -2,7 +2,7 @@ import * as React from 'react'; import { mount as mountBase } from '@cypress/react'; import { FluentProvider } from '@fluentui/react-provider'; import { teamsLightTheme } from '@fluentui/react-theme'; -import { PortalCompatProvider } from '../src'; +import { PortalCompatProvider } from '@fluentui/react-portal-compat'; import { usePortalCompat } from '@fluentui/react-portal-compat-context'; const mount = (element: JSX.Element) => { diff --git a/packages/react-components/react-portal-compat/e2e/tsconfig.json b/packages/react-components/react-portal-compat/tsconfig.cy.json similarity index 70% rename from packages/react-components/react-portal-compat/e2e/tsconfig.json rename to packages/react-components/react-portal-compat/tsconfig.cy.json index f6b23b30d510ba..93a140885851da 100644 --- a/packages/react-components/react-portal-compat/e2e/tsconfig.json +++ b/packages/react-components/react-portal-compat/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-portal-compat/tsconfig.json b/packages/react-components/react-portal-compat/tsconfig.json index 8a5dce296d241f..2502aa8966a259 100644 --- a/packages/react-components/react-portal-compat/tsconfig.json +++ b/packages/react-components/react-portal-compat/tsconfig.json @@ -18,6 +18,9 @@ }, { "path": "./tsconfig.spec.json" + }, + { + "path": "./tsconfig.cy.json" } ] } diff --git a/packages/react-components/react-portal-compat/tsconfig.lib.json b/packages/react-components/react-portal-compat/tsconfig.lib.json index 7763b7fe82bad3..c2f9c89ec5c8d6 100644 --- a/packages/react-components/react-portal-compat/tsconfig.lib.json +++ b/packages/react-components/react-portal-compat/tsconfig.lib.json @@ -9,6 +9,6 @@ "inlineSources": true, "types": ["static-assets", "environment"] }, - "exclude": ["**/*.spec.ts", "**/*.spec.tsx", "**/*.test.ts", "**/*.test.tsx"], + "exclude": ["**/*.spec.ts", "**/*.spec.tsx", "**/*.test.ts", "**/*.test.tsx", "**/*.cy.ts", "**/*.cy.tsx"], "include": ["./src/**/*.ts", "./src/**/*.tsx"] } diff --git a/packages/react-components/react-portal-compat/tsconfig.spec.json b/packages/react-components/react-portal-compat/tsconfig.spec.json index 469fcba4d7ba75..911456fe4b4d91 100644 --- a/packages/react-components/react-portal-compat/tsconfig.spec.json +++ b/packages/react-components/react-portal-compat/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 f0625f35c4b15396cc8e88de18284e8a51b4d078 Mon Sep 17 00:00:00 2001 From: Tristan Watanabe Date: Tue, 1 Nov 2022 17:54:19 -0700 Subject: [PATCH 3/6] chore(react-portal-compat-context): run migration generator --- .../react-portal-compat-context/.npmignore | 5 +++-- .../react-portal-compat-context/{ => docs}/Spec.md | 0 .../react-portal-compat-context/tsconfig.spec.json | 10 +++++++++- 3 files changed, 12 insertions(+), 3 deletions(-) rename packages/react-components/react-portal-compat-context/{ => docs}/Spec.md (100%) diff --git a/packages/react-components/react-portal-compat-context/.npmignore b/packages/react-components/react-portal-compat-context/.npmignore index 52d2a7273a151d..f7ce568a6dbf7c 100644 --- a/packages/react-components/react-portal-compat-context/.npmignore +++ b/packages/react-components/react-portal-compat-context/.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-portal-compat-context/Spec.md b/packages/react-components/react-portal-compat-context/docs/Spec.md similarity index 100% rename from packages/react-components/react-portal-compat-context/Spec.md rename to packages/react-components/react-portal-compat-context/docs/Spec.md diff --git a/packages/react-components/react-portal-compat-context/tsconfig.spec.json b/packages/react-components/react-portal-compat-context/tsconfig.spec.json index 469fcba4d7ba75..911456fe4b4d91 100644 --- a/packages/react-components/react-portal-compat-context/tsconfig.spec.json +++ b/packages/react-components/react-portal-compat-context/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 243cd48f259430fb0e948df44ab6faf59e727152 Mon Sep 17 00:00:00 2001 From: Tristan Watanabe Date: Tue, 1 Nov 2022 17:55:44 -0700 Subject: [PATCH 4/6] Change Files --- ...-react-portal-54fcbe1c-d23f-48f6-916a-9752737af543.json | 7 +++++++ ...portal-compat-0f43f3ad-6a47-4dec-8dfc-209831dd34b5.json | 7 +++++++ ...ompat-context-a9e06321-41d0-43bb-b673-d1da46746c8a.json | 7 +++++++ 3 files changed, 21 insertions(+) create mode 100644 change/@fluentui-react-portal-54fcbe1c-d23f-48f6-916a-9752737af543.json create mode 100644 change/@fluentui-react-portal-compat-0f43f3ad-6a47-4dec-8dfc-209831dd34b5.json create mode 100644 change/@fluentui-react-portal-compat-context-a9e06321-41d0-43bb-b673-d1da46746c8a.json diff --git a/change/@fluentui-react-portal-54fcbe1c-d23f-48f6-916a-9752737af543.json b/change/@fluentui-react-portal-54fcbe1c-d23f-48f6-916a-9752737af543.json new file mode 100644 index 00000000000000..2a770628b1160d --- /dev/null +++ b/change/@fluentui-react-portal-54fcbe1c-d23f-48f6-916a-9752737af543.json @@ -0,0 +1,7 @@ +{ + "type": "patch", + "comment": "chore: Migrate to new package structure.", + "packageName": "@fluentui/react-portal", + "email": "tristan.watanabe@gmail.com", + "dependentChangeType": "patch" +} diff --git a/change/@fluentui-react-portal-compat-0f43f3ad-6a47-4dec-8dfc-209831dd34b5.json b/change/@fluentui-react-portal-compat-0f43f3ad-6a47-4dec-8dfc-209831dd34b5.json new file mode 100644 index 00000000000000..7fa24ca821436f --- /dev/null +++ b/change/@fluentui-react-portal-compat-0f43f3ad-6a47-4dec-8dfc-209831dd34b5.json @@ -0,0 +1,7 @@ +{ + "type": "none", + "comment": "chore: Migrate to new package structure.", + "packageName": "@fluentui/react-portal-compat", + "email": "tristan.watanabe@gmail.com", + "dependentChangeType": "none" +} diff --git a/change/@fluentui-react-portal-compat-context-a9e06321-41d0-43bb-b673-d1da46746c8a.json b/change/@fluentui-react-portal-compat-context-a9e06321-41d0-43bb-b673-d1da46746c8a.json new file mode 100644 index 00000000000000..11d29d810c6b48 --- /dev/null +++ b/change/@fluentui-react-portal-compat-context-a9e06321-41d0-43bb-b673-d1da46746c8a.json @@ -0,0 +1,7 @@ +{ + "type": "patch", + "comment": "chore: Migrate to new package structure.", + "packageName": "@fluentui/react-portal-compat-context", + "email": "tristan.watanabe@gmail.com", + "dependentChangeType": "patch" +} From 6cf9d966aeda367740e44ad880a092d08bf3f224 Mon Sep 17 00:00:00 2001 From: Tristan Watanabe Date: Tue, 1 Nov 2022 18:27:35 -0700 Subject: [PATCH 5/6] fix(react-portal-compat): fix lint error --- .../react-portal-compat/src/PortalCompat.cy.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/react-components/react-portal-compat/src/PortalCompat.cy.tsx b/packages/react-components/react-portal-compat/src/PortalCompat.cy.tsx index 1781f72c66bdf7..92f406ed4374b1 100644 --- a/packages/react-components/react-portal-compat/src/PortalCompat.cy.tsx +++ b/packages/react-components/react-portal-compat/src/PortalCompat.cy.tsx @@ -21,7 +21,7 @@ describe('PortalCompat', () => { if (ref.current) { return registerPortal(ref.current); } - }, []); + }, [registerPortal]); return (
From 544949052edfccac16b910c880a6cbb841a3cc20 Mon Sep 17 00:00:00 2001 From: Tristan Watanabe Date: Tue, 1 Nov 2022 21:05:38 -0700 Subject: [PATCH 6/6] nit: dont include /testing in tsconfig glob --- .../react-portal-compat-context/tsconfig.spec.json | 10 +--------- .../react-portal-compat/tsconfig.spec.json | 10 +--------- .../react-components/react-portal/tsconfig.spec.json | 10 +--------- 3 files changed, 3 insertions(+), 27 deletions(-) diff --git a/packages/react-components/react-portal-compat-context/tsconfig.spec.json b/packages/react-components/react-portal-compat-context/tsconfig.spec.json index 911456fe4b4d91..469fcba4d7ba75 100644 --- a/packages/react-components/react-portal-compat-context/tsconfig.spec.json +++ b/packages/react-components/react-portal-compat-context/tsconfig.spec.json @@ -5,13 +5,5 @@ "outDir": "dist", "types": ["jest", "node"] }, - "include": [ - "**/*.spec.ts", - "**/*.spec.tsx", - "**/*.test.ts", - "**/*.test.tsx", - "**/*.d.ts", - "./src/testing/**/*.ts", - "./src/testing/**/*.tsx" - ] + "include": ["**/*.spec.ts", "**/*.spec.tsx", "**/*.test.ts", "**/*.test.tsx", "**/*.d.ts"] } diff --git a/packages/react-components/react-portal-compat/tsconfig.spec.json b/packages/react-components/react-portal-compat/tsconfig.spec.json index 911456fe4b4d91..469fcba4d7ba75 100644 --- a/packages/react-components/react-portal-compat/tsconfig.spec.json +++ b/packages/react-components/react-portal-compat/tsconfig.spec.json @@ -5,13 +5,5 @@ "outDir": "dist", "types": ["jest", "node"] }, - "include": [ - "**/*.spec.ts", - "**/*.spec.tsx", - "**/*.test.ts", - "**/*.test.tsx", - "**/*.d.ts", - "./src/testing/**/*.ts", - "./src/testing/**/*.tsx" - ] + "include": ["**/*.spec.ts", "**/*.spec.tsx", "**/*.test.ts", "**/*.test.tsx", "**/*.d.ts"] } diff --git a/packages/react-components/react-portal/tsconfig.spec.json b/packages/react-components/react-portal/tsconfig.spec.json index 0e881941843de8..11f8254e711f4c 100644 --- a/packages/react-components/react-portal/tsconfig.spec.json +++ b/packages/react-components/react-portal/tsconfig.spec.json @@ -5,13 +5,5 @@ "outDir": "dist", "types": ["jest", "node", "@testing-library/jest-dom"] }, - "include": [ - "**/*.spec.ts", - "**/*.spec.tsx", - "**/*.test.ts", - "**/*.test.tsx", - "**/*.d.ts", - "./src/testing/**/*.ts", - "./src/testing/**/*.tsx" - ] + "include": ["**/*.spec.ts", "**/*.spec.tsx", "**/*.test.ts", "**/*.test.tsx", "**/*.d.ts"] }