From d5b830e7f5e1677a5228e256433ae19dbaa13509 Mon Sep 17 00:00:00 2001 From: Tristan Watanabe Date: Sun, 16 Oct 2022 20:41:17 -0700 Subject: [PATCH 1/6] chore: run migration generator and move fake node_modules to src/testing --- .../babel-preset-global-context/.npmignore | 5 +++-- .../{e2e/Test.e2e.tsx => src/Test.cy.tsx} | 0 .../testing}/fake_node_modules/context-v1.0.0/index.ts | 0 .../fake_node_modules/context-v1.0.0/package.json | 0 .../testing}/fake_node_modules/context-v1.1.0/index.ts | 0 .../fake_node_modules/context-v1.1.0/package.json | 0 .../testing}/fake_node_modules/context-v2.0.0/index.ts | 0 .../fake_node_modules/context-v2.0.0/package.json | 0 .../fake_node_modules/ignored-context-v1.0.0/index.ts | 0 .../ignored-context-v1.0.0/package.json | 0 .../fake_node_modules/ignored-context-v1.1.0/index.ts | 0 .../ignored-context-v1.1.0/package.json | 0 .../{e2e/tsconfig.json => tsconfig.cy.json} | 4 ++-- .../babel-preset-global-context/tsconfig.json | 2 +- .../babel-preset-global-context/tsconfig.lib.json | 2 +- .../babel-preset-global-context/tsconfig.spec.json | 10 +++++++++- 16 files changed, 16 insertions(+), 7 deletions(-) rename packages/react-components/babel-preset-global-context/{e2e/Test.e2e.tsx => src/Test.cy.tsx} (100%) rename packages/react-components/babel-preset-global-context/{e2e => src/testing}/fake_node_modules/context-v1.0.0/index.ts (100%) rename packages/react-components/babel-preset-global-context/{e2e => src/testing}/fake_node_modules/context-v1.0.0/package.json (100%) rename packages/react-components/babel-preset-global-context/{e2e => src/testing}/fake_node_modules/context-v1.1.0/index.ts (100%) rename packages/react-components/babel-preset-global-context/{e2e => src/testing}/fake_node_modules/context-v1.1.0/package.json (100%) rename packages/react-components/babel-preset-global-context/{e2e => src/testing}/fake_node_modules/context-v2.0.0/index.ts (100%) rename packages/react-components/babel-preset-global-context/{e2e => src/testing}/fake_node_modules/context-v2.0.0/package.json (100%) rename packages/react-components/babel-preset-global-context/{e2e => src/testing}/fake_node_modules/ignored-context-v1.0.0/index.ts (100%) rename packages/react-components/babel-preset-global-context/{e2e => src/testing}/fake_node_modules/ignored-context-v1.0.0/package.json (100%) rename packages/react-components/babel-preset-global-context/{e2e => src/testing}/fake_node_modules/ignored-context-v1.1.0/index.ts (100%) rename packages/react-components/babel-preset-global-context/{e2e => src/testing}/fake_node_modules/ignored-context-v1.1.0/package.json (100%) rename packages/react-components/babel-preset-global-context/{e2e/tsconfig.json => tsconfig.cy.json} (70%) diff --git a/packages/react-components/babel-preset-global-context/.npmignore b/packages/react-components/babel-preset-global-context/.npmignore index 52d2a7273a151..f7ce568a6dbf7 100644 --- a/packages/react-components/babel-preset-global-context/.npmignore +++ b/packages/react-components/babel-preset-global-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/babel-preset-global-context/e2e/Test.e2e.tsx b/packages/react-components/babel-preset-global-context/src/Test.cy.tsx similarity index 100% rename from packages/react-components/babel-preset-global-context/e2e/Test.e2e.tsx rename to packages/react-components/babel-preset-global-context/src/Test.cy.tsx diff --git a/packages/react-components/babel-preset-global-context/e2e/fake_node_modules/context-v1.0.0/index.ts b/packages/react-components/babel-preset-global-context/src/testing/fake_node_modules/context-v1.0.0/index.ts similarity index 100% rename from packages/react-components/babel-preset-global-context/e2e/fake_node_modules/context-v1.0.0/index.ts rename to packages/react-components/babel-preset-global-context/src/testing/fake_node_modules/context-v1.0.0/index.ts diff --git a/packages/react-components/babel-preset-global-context/e2e/fake_node_modules/context-v1.0.0/package.json b/packages/react-components/babel-preset-global-context/src/testing/fake_node_modules/context-v1.0.0/package.json similarity index 100% rename from packages/react-components/babel-preset-global-context/e2e/fake_node_modules/context-v1.0.0/package.json rename to packages/react-components/babel-preset-global-context/src/testing/fake_node_modules/context-v1.0.0/package.json diff --git a/packages/react-components/babel-preset-global-context/e2e/fake_node_modules/context-v1.1.0/index.ts b/packages/react-components/babel-preset-global-context/src/testing/fake_node_modules/context-v1.1.0/index.ts similarity index 100% rename from packages/react-components/babel-preset-global-context/e2e/fake_node_modules/context-v1.1.0/index.ts rename to packages/react-components/babel-preset-global-context/src/testing/fake_node_modules/context-v1.1.0/index.ts diff --git a/packages/react-components/babel-preset-global-context/e2e/fake_node_modules/context-v1.1.0/package.json b/packages/react-components/babel-preset-global-context/src/testing/fake_node_modules/context-v1.1.0/package.json similarity index 100% rename from packages/react-components/babel-preset-global-context/e2e/fake_node_modules/context-v1.1.0/package.json rename to packages/react-components/babel-preset-global-context/src/testing/fake_node_modules/context-v1.1.0/package.json diff --git a/packages/react-components/babel-preset-global-context/e2e/fake_node_modules/context-v2.0.0/index.ts b/packages/react-components/babel-preset-global-context/src/testing/fake_node_modules/context-v2.0.0/index.ts similarity index 100% rename from packages/react-components/babel-preset-global-context/e2e/fake_node_modules/context-v2.0.0/index.ts rename to packages/react-components/babel-preset-global-context/src/testing/fake_node_modules/context-v2.0.0/index.ts diff --git a/packages/react-components/babel-preset-global-context/e2e/fake_node_modules/context-v2.0.0/package.json b/packages/react-components/babel-preset-global-context/src/testing/fake_node_modules/context-v2.0.0/package.json similarity index 100% rename from packages/react-components/babel-preset-global-context/e2e/fake_node_modules/context-v2.0.0/package.json rename to packages/react-components/babel-preset-global-context/src/testing/fake_node_modules/context-v2.0.0/package.json diff --git a/packages/react-components/babel-preset-global-context/e2e/fake_node_modules/ignored-context-v1.0.0/index.ts b/packages/react-components/babel-preset-global-context/src/testing/fake_node_modules/ignored-context-v1.0.0/index.ts similarity index 100% rename from packages/react-components/babel-preset-global-context/e2e/fake_node_modules/ignored-context-v1.0.0/index.ts rename to packages/react-components/babel-preset-global-context/src/testing/fake_node_modules/ignored-context-v1.0.0/index.ts diff --git a/packages/react-components/babel-preset-global-context/e2e/fake_node_modules/ignored-context-v1.0.0/package.json b/packages/react-components/babel-preset-global-context/src/testing/fake_node_modules/ignored-context-v1.0.0/package.json similarity index 100% rename from packages/react-components/babel-preset-global-context/e2e/fake_node_modules/ignored-context-v1.0.0/package.json rename to packages/react-components/babel-preset-global-context/src/testing/fake_node_modules/ignored-context-v1.0.0/package.json diff --git a/packages/react-components/babel-preset-global-context/e2e/fake_node_modules/ignored-context-v1.1.0/index.ts b/packages/react-components/babel-preset-global-context/src/testing/fake_node_modules/ignored-context-v1.1.0/index.ts similarity index 100% rename from packages/react-components/babel-preset-global-context/e2e/fake_node_modules/ignored-context-v1.1.0/index.ts rename to packages/react-components/babel-preset-global-context/src/testing/fake_node_modules/ignored-context-v1.1.0/index.ts diff --git a/packages/react-components/babel-preset-global-context/e2e/fake_node_modules/ignored-context-v1.1.0/package.json b/packages/react-components/babel-preset-global-context/src/testing/fake_node_modules/ignored-context-v1.1.0/package.json similarity index 100% rename from packages/react-components/babel-preset-global-context/e2e/fake_node_modules/ignored-context-v1.1.0/package.json rename to packages/react-components/babel-preset-global-context/src/testing/fake_node_modules/ignored-context-v1.1.0/package.json diff --git a/packages/react-components/babel-preset-global-context/e2e/tsconfig.json b/packages/react-components/babel-preset-global-context/tsconfig.cy.json similarity index 70% rename from packages/react-components/babel-preset-global-context/e2e/tsconfig.json rename to packages/react-components/babel-preset-global-context/tsconfig.cy.json index f6b23b30d510b..93a140885851d 100644 --- a/packages/react-components/babel-preset-global-context/e2e/tsconfig.json +++ b/packages/react-components/babel-preset-global-context/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/babel-preset-global-context/tsconfig.json b/packages/react-components/babel-preset-global-context/tsconfig.json index dcb3b091c7bc9..c8027a33f2aeb 100644 --- a/packages/react-components/babel-preset-global-context/tsconfig.json +++ b/packages/react-components/babel-preset-global-context/tsconfig.json @@ -19,7 +19,7 @@ "path": "./tsconfig.spec.json" }, { - "path": "./e2e/tsconfig.json" + "path": "./tsconfig.cy.json" } ] } diff --git a/packages/react-components/babel-preset-global-context/tsconfig.lib.json b/packages/react-components/babel-preset-global-context/tsconfig.lib.json index e959f1c626bb3..6b77ffea2342d 100644 --- a/packages/react-components/babel-preset-global-context/tsconfig.lib.json +++ b/packages/react-components/babel-preset-global-context/tsconfig.lib.json @@ -10,6 +10,6 @@ "types": ["static-assets", "environment", "node"], "module": "CommonJS" }, - "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/babel-preset-global-context/tsconfig.spec.json b/packages/react-components/babel-preset-global-context/tsconfig.spec.json index 469fcba4d7ba7..911456fe4b4d9 100644 --- a/packages/react-components/babel-preset-global-context/tsconfig.spec.json +++ b/packages/react-components/babel-preset-global-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 3bbf8c0500fa0335be73cc7fc828537148b01ccf Mon Sep 17 00:00:00 2001 From: Tristan Watanabe Date: Sun, 16 Oct 2022 20:43:52 -0700 Subject: [PATCH 2/6] fix: linting errors and import paths --- .../src/Test.cy.tsx | 20 ++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/packages/react-components/babel-preset-global-context/src/Test.cy.tsx b/packages/react-components/babel-preset-global-context/src/Test.cy.tsx index 3ccb475eb8a2a..47ed3fc7fc3ad 100644 --- a/packages/react-components/babel-preset-global-context/src/Test.cy.tsx +++ b/packages/react-components/babel-preset-global-context/src/Test.cy.tsx @@ -2,15 +2,16 @@ * These tests are run with the specific cypress.config.ts file * in this project in order to consume @fluentui/babel-preset-global-context during bundling */ - +// eslint-disable-next-line import/no-extraneous-dependencies import * as React from 'react'; +// eslint-disable-next-line import/no-extraneous-dependencies import { mount } from '@cypress/react'; -import { ProviderContext as ProviderContextV1 } from './fake_node_modules/context-v1.0.0'; -import { ProviderContext as ProviderContextV11 } from './fake_node_modules/context-v1.1.0'; -import { ProviderContext as ProviderContextV2 } from './fake_node_modules/context-v2.0.0'; +import { ProviderContext as ProviderContextV1 } from './testing/fake_node_modules/context-v1.0.0'; +import { ProviderContext as ProviderContextV11 } from './testing/fake_node_modules/context-v1.1.0'; +import { ProviderContext as ProviderContextV2 } from './testing/fake_node_modules/context-v2.0.0'; -import { ProviderContext as IgnoredContextV1 } from './fake_node_modules/ignored-context-v1.0.0'; -import { ProviderContext as IgnoredContextV11 } from './fake_node_modules/ignored-context-v1.1.0'; +import { ProviderContext as IgnoredContextV1 } from './testing/fake_node_modules/ignored-context-v1.0.0'; +import { ProviderContext as IgnoredContextV11 } from './testing/fake_node_modules/ignored-context-v1.1.0'; describe('babel-preset-global-context', () => { describe('targeted packages', () => { @@ -18,6 +19,7 @@ describe('babel-preset-global-context', () => { const v1Bar = 'v1-bar'; const v2Bar = 'v2-bar'; + // eslint-disable-next-line @typescript-eslint/naming-convention function Consumer() { const ctx = React.useContext(ProviderContextV1); const ctxV11 = React.useContext(ProviderContextV11); @@ -32,7 +34,7 @@ describe('babel-preset-global-context', () => { ); } - + // eslint-disable-next-line @typescript-eslint/naming-convention function Example() { return ( @@ -69,7 +71,7 @@ describe('babel-preset-global-context', () => { // configured in cypress.config.ts describe('untargeted packages', () => { const v1Foo = 'v1-foo'; - + // eslint-disable-next-line @typescript-eslint/naming-convention function Consumer() { const ctx = React.useContext(IgnoredContextV1); const ctxV11 = React.useContext(IgnoredContextV11); @@ -80,7 +82,7 @@ describe('babel-preset-global-context', () => { ); } - + // eslint-disable-next-line @typescript-eslint/naming-convention function Example() { return ( From 8108058a6c40ddf336fcdf9e4d613dbf6ad0f934 Mon Sep 17 00:00:00 2001 From: Tristan Watanabe Date: Sun, 16 Oct 2022 20:46:25 -0700 Subject: [PATCH 3/6] Change File --- ...lobal-context-212f2dca-9295-4527-9dcd-ce64883acf91.json | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 change/@fluentui-babel-preset-global-context-212f2dca-9295-4527-9dcd-ce64883acf91.json diff --git a/change/@fluentui-babel-preset-global-context-212f2dca-9295-4527-9dcd-ce64883acf91.json b/change/@fluentui-babel-preset-global-context-212f2dca-9295-4527-9dcd-ce64883acf91.json new file mode 100644 index 0000000000000..b78e661d31142 --- /dev/null +++ b/change/@fluentui-babel-preset-global-context-212f2dca-9295-4527-9dcd-ce64883acf91.json @@ -0,0 +1,7 @@ +{ + "type": "none", + "comment": "chore: Migrate to new package structure.", + "packageName": "@fluentui/babel-preset-global-context", + "email": "tristan.watanabe@gmail.com", + "dependentChangeType": "none" +} From 58f1cc6d742ea3d72c322fa8ce592b3a8b483c2a Mon Sep 17 00:00:00 2001 From: Tristan Watanabe Date: Sun, 16 Oct 2022 20:50:30 -0700 Subject: [PATCH 4/6] Update Change File --- ...t-global-context-212f2dca-9295-4527-9dcd-ce64883acf91.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/change/@fluentui-babel-preset-global-context-212f2dca-9295-4527-9dcd-ce64883acf91.json b/change/@fluentui-babel-preset-global-context-212f2dca-9295-4527-9dcd-ce64883acf91.json index b78e661d31142..8ffed71324689 100644 --- a/change/@fluentui-babel-preset-global-context-212f2dca-9295-4527-9dcd-ce64883acf91.json +++ b/change/@fluentui-babel-preset-global-context-212f2dca-9295-4527-9dcd-ce64883acf91.json @@ -1,7 +1,7 @@ { - "type": "none", + "type": "prerelease", "comment": "chore: Migrate to new package structure.", "packageName": "@fluentui/babel-preset-global-context", "email": "tristan.watanabe@gmail.com", - "dependentChangeType": "none" + "dependentChangeType": "patch" } From 112d30e8cd8f5536c97fccd61ad684f955aa5783 Mon Sep 17 00:00:00 2001 From: Tristan Watanabe Date: Sun, 16 Oct 2022 21:16:24 -0700 Subject: [PATCH 5/6] Change File set to none --- ...t-global-context-212f2dca-9295-4527-9dcd-ce64883acf91.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/change/@fluentui-babel-preset-global-context-212f2dca-9295-4527-9dcd-ce64883acf91.json b/change/@fluentui-babel-preset-global-context-212f2dca-9295-4527-9dcd-ce64883acf91.json index 8ffed71324689..b78e661d31142 100644 --- a/change/@fluentui-babel-preset-global-context-212f2dca-9295-4527-9dcd-ce64883acf91.json +++ b/change/@fluentui-babel-preset-global-context-212f2dca-9295-4527-9dcd-ce64883acf91.json @@ -1,7 +1,7 @@ { - "type": "prerelease", + "type": "none", "comment": "chore: Migrate to new package structure.", "packageName": "@fluentui/babel-preset-global-context", "email": "tristan.watanabe@gmail.com", - "dependentChangeType": "patch" + "dependentChangeType": "none" } From 48f5b6e09e5d9fc7434f871c4bb47b4d0b8b8e4a Mon Sep 17 00:00:00 2001 From: Tristan Watanabe Date: Fri, 21 Oct 2022 14:25:19 -0700 Subject: [PATCH 6/6] fix: address lint errors --- .../src/testing/fake_node_modules/context-v1.0.0/index.ts | 1 + .../src/testing/fake_node_modules/context-v1.1.0/index.ts | 1 + .../src/testing/fake_node_modules/context-v2.0.0/index.ts | 1 + .../testing/fake_node_modules/ignored-context-v1.0.0/index.ts | 1 + .../testing/fake_node_modules/ignored-context-v1.1.0/index.ts | 1 + 5 files changed, 5 insertions(+) diff --git a/packages/react-components/babel-preset-global-context/src/testing/fake_node_modules/context-v1.0.0/index.ts b/packages/react-components/babel-preset-global-context/src/testing/fake_node_modules/context-v1.0.0/index.ts index e124f68f2847e..62a0e79eaf229 100644 --- a/packages/react-components/babel-preset-global-context/src/testing/fake_node_modules/context-v1.0.0/index.ts +++ b/packages/react-components/babel-preset-global-context/src/testing/fake_node_modules/context-v1.0.0/index.ts @@ -1,3 +1,4 @@ +// eslint-disable-next-line import/no-extraneous-dependencies import * as React from 'react'; export interface ProviderContextValue { diff --git a/packages/react-components/babel-preset-global-context/src/testing/fake_node_modules/context-v1.1.0/index.ts b/packages/react-components/babel-preset-global-context/src/testing/fake_node_modules/context-v1.1.0/index.ts index 8929771f513c2..c511162e9a23c 100644 --- a/packages/react-components/babel-preset-global-context/src/testing/fake_node_modules/context-v1.1.0/index.ts +++ b/packages/react-components/babel-preset-global-context/src/testing/fake_node_modules/context-v1.1.0/index.ts @@ -1,3 +1,4 @@ +// eslint-disable-next-line import/no-extraneous-dependencies import { createContext } from 'react'; export interface ProviderContextValue { diff --git a/packages/react-components/babel-preset-global-context/src/testing/fake_node_modules/context-v2.0.0/index.ts b/packages/react-components/babel-preset-global-context/src/testing/fake_node_modules/context-v2.0.0/index.ts index a3507ee85101f..a8f26851d64e2 100644 --- a/packages/react-components/babel-preset-global-context/src/testing/fake_node_modules/context-v2.0.0/index.ts +++ b/packages/react-components/babel-preset-global-context/src/testing/fake_node_modules/context-v2.0.0/index.ts @@ -1,3 +1,4 @@ +// eslint-disable-next-line import/no-extraneous-dependencies import * as React from 'react'; export interface ProviderContextValueV2 { diff --git a/packages/react-components/babel-preset-global-context/src/testing/fake_node_modules/ignored-context-v1.0.0/index.ts b/packages/react-components/babel-preset-global-context/src/testing/fake_node_modules/ignored-context-v1.0.0/index.ts index 757d0845497c9..f46cebec169e2 100644 --- a/packages/react-components/babel-preset-global-context/src/testing/fake_node_modules/ignored-context-v1.0.0/index.ts +++ b/packages/react-components/babel-preset-global-context/src/testing/fake_node_modules/ignored-context-v1.0.0/index.ts @@ -1,3 +1,4 @@ +// eslint-disable-next-line import/no-extraneous-dependencies import * as React from 'react'; export interface ProviderContextValueV2 { diff --git a/packages/react-components/babel-preset-global-context/src/testing/fake_node_modules/ignored-context-v1.1.0/index.ts b/packages/react-components/babel-preset-global-context/src/testing/fake_node_modules/ignored-context-v1.1.0/index.ts index 5c1bc655307a0..fca11d8732688 100644 --- a/packages/react-components/babel-preset-global-context/src/testing/fake_node_modules/ignored-context-v1.1.0/index.ts +++ b/packages/react-components/babel-preset-global-context/src/testing/fake_node_modules/ignored-context-v1.1.0/index.ts @@ -1,3 +1,4 @@ +// eslint-disable-next-line import/no-extraneous-dependencies import * as React from 'react'; export interface ProviderContextValueV2 {