Merge react-internal back into react (#16832)

* Merge react and react-internal changelogs

* Move react-internal contents back to react

* Merge config files

* Make react-date-time re-export from react

* Remove config references to react-internal

* Update references to react-internal

* Update react-date-time references to mostly point to react

* Update APIs and eslint-disables

* fix api-docs generation by renaming CompatButton docCategory to Button

.github/CODEOWNERS

@@ -96,69 +96,71 @@ packages/react-tabs/ @behowell
 packages/react-toggle/ @xugao
 
 ## Components
-packages/react-internal/src/components/ActivityItem/ @xugao
-packages/react-internal/src/components/Announced/ @khmakoto
+packages/react/src/components/ActivityItem/ @xugao
+packages/react/src/components/Announced/ @khmakoto
 packages/react/src/components/Breadcrumb/ @xugao
-packages/react-internal/src/compat/components/Button/ @khmakoto
-packages/react-internal/src/components/Calendar/ @lorejoh12 @pompomon
-packages/react-internal/src/components/Callout/ @joschect
-packages/react-internal/src/components/Check/ @dzearing @xugao
-packages/react-internal/src/components/Checkbox/ @khmakoto @xugao
-packages/react-internal/src/components/ChoiceGroup/ @ecraig12345
-packages/react-internal/src/components/Coachmark/ @leddie24
-packages/react-internal/src/components/ColorPicker/ @ecraig12345
+packages/react/src/compat/components/Button/ @khmakoto
+packages/react/src/components/Calendar/ @lorejoh12 @pompomon
+packages/react/src/components/CalendarDayGrid/ @lorejoh12
+packages/react/src/components/Callout/ @joschect
+packages/react/src/components/Check/ @dzearing @xugao
+packages/react/src/components/Checkbox/ @khmakoto @xugao
+packages/react/src/components/ChoiceGroup/ @ecraig12345
+packages/react/src/components/Coachmark/ @leddie24
+packages/react/src/components/ColorPicker/ @ecraig12345
 packages/react/src/components/ComboBox/ @joschect
-packages/react-internal/src/components/CommandBar/ @micahgodbolt @joschect
-packages/react-internal/src/components/ContextualMenu/ @joschect
-packages/react-internal/src/components/DatePicker/ @lorejoh12 @pompomon
+packages/react/src/components/CommandBar/ @micahgodbolt @joschect
+packages/react/src/components/ContextualMenu/ @joschect
+packages/react/src/components/DatePicker/ @lorejoh12 @pompomon
 packages/react/src/components/DetailsList/ @dzearing
-packages/react-internal/src/components/Dialog/ @joschect
+packages/react/src/components/Dialog/ @joschect
 packages/react/src/components/DocumentCard/ @yiminwu
 packages/react/src/components/Dropdown/ @joschect
-packages/react-internal/src/components/Fabric/ @dzearing
-packages/react-internal/src/components/Facepile/ @markionium @mtennoe
-packages/react-internal/src/components/FolderCover/ @ThomasMichon @bigbadcapers
-packages/react-internal/src/components/FocusTrapZone/ @khmakoto
+packages/react/src/components/Fabric/ @dzearing
+packages/react/src/components/Facepile/ @markionium @mtennoe
+packages/react/src/components/FolderCover/ @ThomasMichon @bigbadcapers
+packages/react/src/components/FocusTrapZone/ @khmakoto
 packages/react/src/components/GroupedList/  @aditima @dzearing
-packages/react-internal/src/components/HoverCard/  @Jahnp @Vitalius1
-packages/react-internal/src/components/Icon/ @dzearing @ecraig12345
-packages/react-internal/src/components/Image/ @dzearing
-packages/react-internal/src/components/Label/ @khmakoto
-packages/react-internal/src/components/Layer/  @ThomasMichon
-packages/react-internal/src/components/Link/ @khmakoto
-packages/react-internal/src/components/List/ @dzearing
-packages/react-internal/src/components/MarqueeSelection/ @dzearing
-packages/react-internal/src/components/MessageBar/ @ecraig12345
-packages/react-internal/src/components/Modal/ @joschect
-packages/react-internal/src/components/Nav/ @ecraig12345
-packages/react-internal/src/components/OverflowSet/ @micahgodbolt
-packages/react-internal/src/components/Overlay/ @xugao
-packages/react-internal/src/components/Panel/ @xugao
-packages/react-internal/src/components/Persona/ @markionium @mtennoe
-packages/react-internal/src/components/PersonaCoin/ @mtennoe @markionium
-packages/react-internal/src/components/Persona/PersonaConsts.tsx @mtennoe
-packages/react-internal/src/components/pickers/  @joschect
-packages/react-internal/src/components/Pivot/ @behowell
-packages/react-internal/src/components/Popup/ @joschect
-packages/react-internal/src/components/ProgressIndicator/ @xugao
-packages/react-internal/src/components/Rating/ @jdhuntington
-packages/react-internal/src/components/ResizeGroup/ @micahgodbolt
-packages/react-internal/src/components/SearchBox/ @ecraig12345
-packages/react-internal/src/components/Separator/ @joschemd @khmakoto
-packages/react-internal/src/components/Shimmer/ @Vitalius1
-packages/react-internal/src/components/Slider/ @joschect
-packages/react-internal/src/components/SpinButton/ @ecraig12345
-packages/react-internal/src/components/Spinner/ @xugao
-packages/react-internal/src/components/Stack/  @khmakoto
-packages/react-internal/src/components/SwatchColorPicker/ @ecraig12345
-packages/react-internal/src/components/TeachingBubble/ @micahgodbolt
-packages/react-internal/src/components/Text/ @khmakoto
-packages/react-internal/src/components/TextField/ @ecraig12345
-packages/react-internal/src/components/Toggle/ @khmakoto
-packages/react-internal/src/components/Tooltip/ @micahgodbolt
+packages/react/src/components/HoverCard/  @Jahnp @Vitalius1
+packages/react/src/components/Icon/ @dzearing @ecraig12345
+packages/react/src/components/Image/ @dzearing
+packages/react/src/components/Label/ @khmakoto
+packages/react/src/components/Layer/  @ThomasMichon
+packages/react/src/components/Link/ @khmakoto
+packages/react/src/components/List/ @dzearing
+packages/react/src/components/MarqueeSelection/ @dzearing
+packages/react/src/components/MessageBar/ @ecraig12345
+packages/react/src/components/Modal/ @joschect
+packages/react/src/components/Nav/ @ecraig12345
+packages/react/src/components/OverflowSet/ @micahgodbolt
+packages/react/src/components/Overlay/ @xugao
+packages/react/src/components/Panel/ @xugao
+packages/react/src/components/Persona/ @markionium @mtennoe
+packages/react/src/components/PersonaCoin/ @mtennoe @markionium
+packages/react/src/components/Persona/PersonaConsts.tsx @mtennoe
+packages/react/src/components/pickers/  @joschect
+packages/react/src/components/Pivot/ @behowell
+packages/react/src/components/Popup/ @joschect
+packages/react/src/components/ProgressIndicator/ @xugao
+packages/react/src/components/Rating/ @jdhuntington
+packages/react/src/components/ResizeGroup/ @micahgodbolt
+packages/react/src/components/SearchBox/ @ecraig12345
+packages/react/src/components/Separator/ @joschemd @khmakoto
+packages/react/src/components/Shimmer/ @Vitalius1
+packages/react/src/components/Slider/ @joschect
+packages/react/src/components/SpinButton/ @ecraig12345
+packages/react/src/components/Spinner/ @xugao
+packages/react/src/components/Stack/  @khmakoto
+packages/react/src/components/SwatchColorPicker/ @ecraig12345
+packages/react/src/components/TeachingBubble/ @micahgodbolt
+packages/react/src/components/Text/ @khmakoto
+packages/react/src/components/TextField/ @ecraig12345
+packages/react/src/components/Toggle/ @khmakoto
+packages/react/src/components/Tooltip/ @micahgodbolt
+packages/react/src/components/WeeklyDayPicker/ @lorejoh12
 
 ## Theming and styling
-packages/react-internal/src/utilities/ThemeProvider @xugao
+packages/react/src/utilities/ThemeProvider @xugao
 
 ## Experiments
 packages/react-experiments/src/components/Pagination/ @caradong

apps/pr-deploy-site/just.config.ts

@@ -25,7 +25,6 @@ const dependencies = [
   '@fluentui/react-button',
   '@fluentui/react-charting',
   '@fluentui/react-checkbox',
-  '@fluentui/react-date-time',
   '@fluentui/react-experiments',
   '@fluentui/react-image',
   '@fluentui/react-link',

apps/pr-deploy-site/pr-deploy-site.js

@@ -43,12 +43,6 @@ const siteInfo = [
     icon: 'CheckboxComposite',
     title: 'Checkbox',
   },
-  {
-    package: '@fluentui/react-date-time',
-    link: './react-date-time/storybook/index.html',
-    icon: 'PrimaryCalendar',
-    title: 'Date/Time',
-  },
   {
     package: '@fluentui/react-image',
     link: './react-image/storybook/index.html',

apps/public-docsite-resources/package.json

@@ -45,7 +45,6 @@
   "dependencies": {
     "@fluentui/react": "^8.0.0-beta.50",
     "@fluentui/react-examples": "^1.1.0",
-    "@fluentui/react-internal": "^8.0.0-beta.44",
     "@microsoft/load-themed-styles": "^1.10.26",
     "@fluentui/api-docs": "^1.0.1",
     "@fluentui/azure-themes": "^8.0.0-beta.49",

apps/public-docsite-resources/src/components/DemoPage.types.ts

@@ -1 +1 @@
-export { IDocPageProps as IDemoPageProps } from '@fluentui/react-internal/lib/common/DocPage.types';
+export { IDocPageProps as IDemoPageProps } from '@fluentui/react/lib/common/DocPage.types';

apps/public-docsite-resources/src/components/pages/CalendarPage.tsx

@@ -1,5 +1,5 @@
 import * as React from 'react';
-import { CalendarPageProps } from '@fluentui/react-examples/lib/react-date-time/Calendar/Calendar.doc';
+import { CalendarPageProps } from '@fluentui/react-examples/lib/react/Calendar/Calendar.doc';
 import { DemoPage } from '../DemoPage';
 
 export const CalendarPage = (props: { isHeaderVisible: boolean }) => (

apps/public-docsite-resources/src/components/pages/DatePickerPage.tsx

@@ -1,7 +1,7 @@
 import * as React from 'react';
 
 import { DemoPage } from '../DemoPage';
-import { DatePickerPageProps } from '@fluentui/react-examples/lib/react-date-time/DatePicker/DatePicker.doc';
+import { DatePickerPageProps } from '@fluentui/react-examples/lib/react/DatePicker/DatePicker.doc';
 
 export const DatePickerPage = (props: { isHeaderVisible: boolean }) => (
   <DemoPage

apps/public-docsite/package.json

@@ -47,7 +47,6 @@
   },
   "dependencies": {
     "@fluentui/react": "^8.0.0-beta.50",
-    "@fluentui/react-internal": "^8.0.0-beta.44",
     "@fluentui/react-examples": "^1.1.0",
     "@fluentui/theme": "^2.0.0-beta.13",
     "@microsoft/load-themed-styles": "^1.10.26",

apps/public-docsite/src/SiteDefinition/SiteDefinition.pages/Controls/web.tsx

@@ -1,7 +1,7 @@
 import * as React from 'react';
 import { INavPage, LoadingComponent } from '@fluentui/react-docsite-components/lib/index2';
 import { ControlsAreaPage } from '../../../pages/Controls/ControlsAreaPage';
-import { IPageJson } from '@fluentui/react-internal/lib/common/DocPage.types';
+import { IPageJson } from '@fluentui/react/lib/common/DocPage.types';
 
 export type CategoryPage = Partial<Omit<INavPage, 'pages'>> & { subPages?: ICategory };
 

apps/public-docsite/src/pages/Controls/ButtonPage/ButtonPage.tsx

@@ -5,7 +5,7 @@ import { ButtonPageProps } from './ButtonPage.doc';
 import { Platforms } from '../../../interfaces/Platforms';
 import { IPageSectionProps } from '@fluentui/react-docsite-components/lib/index2';
 import { ImplementationSection } from '@fluentui/react-docsite-components/lib/index2';
-import { ApiKind } from '@fluentui/react-internal/lib/common/DocPage.types';
+import { ApiKind } from '@fluentui/react/lib/common/DocPage.types';
 
 /* eslint-disable @fluentui/max-len */
 

apps/public-docsite/src/pages/Controls/CalendarPage/CalendarPage.doc.ts

@@ -1,5 +1,5 @@
 import { TFabricPlatformPageProps } from '../../../interfaces/Platforms';
-import { CalendarPageProps as ExternalProps } from '@fluentui/react-examples/lib/react-date-time/Calendar/Calendar.doc';
+import { CalendarPageProps as ExternalProps } from '@fluentui/react-examples/lib/react/Calendar/Calendar.doc';
 import { ISideRailLink } from '@fluentui/react-docsite-components/lib/index2';
 
 const related: ISideRailLink[] = [

apps/public-docsite/src/pages/Controls/ControlsAreaPage.tsx

@@ -2,7 +2,7 @@ import * as React from 'react';
 import { Page, IPageProps, PlatformContext } from '@fluentui/react-docsite-components/lib/index2';
 import { getSubTitle } from '../../utilities/index';
 import { Platforms } from '../../interfaces/Platforms';
-import { IPageJson } from '@fluentui/react-internal/lib/common/DocPage.types';
+import { IPageJson } from '@fluentui/react/lib/common/DocPage.types';
 
 export interface IControlsPageProps extends IPageProps<Platforms> {}
 

apps/public-docsite/src/pages/Controls/DatePickerPage/DatePickerPage.doc.ts

@@ -1,5 +1,5 @@
 import { TFabricPlatformPageProps } from '../../../interfaces/Platforms';
-import { DatePickerPageProps as ExternalProps } from '@fluentui/react-examples/lib/react-date-time/DatePicker/DatePicker.doc';
+import { DatePickerPageProps as ExternalProps } from '@fluentui/react-examples/lib/react/DatePicker/DatePicker.doc';
 import { ISideRailLink } from '@fluentui/react-docsite-components/lib/index2';
 
 const related: ISideRailLink[] = [

apps/public-docsite/src/pages/Controls/LinkPage/LinkPage.tsx

@@ -4,7 +4,7 @@ import { ControlsAreaPage, IControlsPageProps } from '../ControlsAreaPage';
 import { LinkPageProps } from './LinkPage.doc';
 import { Platforms } from '../../../interfaces/Platforms';
 import { ImplementationSection } from '@fluentui/react-docsite-components/lib/index2';
-import { ApiKind } from '@fluentui/react-internal/lib/common/DocPage.types';
+import { ApiKind } from '@fluentui/react/lib/common/DocPage.types';
 
 /* eslint-disable @fluentui/max-len */
 

apps/public-docsite/src/pages/Controls/PersonaPage/PersonaPage.tsx

@@ -4,7 +4,7 @@ import { ControlsAreaPage, IControlsPageProps } from '../ControlsAreaPage';
 import { PersonaPageProps } from './PersonaPage.doc';
 import { Platforms } from '../../../interfaces/Platforms';
 import { ImplementationSection } from '@fluentui/react-docsite-components/lib/index2';
-import { ApiKind } from '@fluentui/react-internal/lib/common/DocPage.types';
+import { ApiKind } from '@fluentui/react/lib/common/DocPage.types';
 
 /* eslint-disable @fluentui/max-len */
 

apps/public-docsite/src/pages/Controls/PickersPage/PickersPage.doc.ts

@@ -7,7 +7,7 @@ const related: ISideRailLink[] = [];
 export const PickersPageProps: TFabricPlatformPageProps = {
   web: {
     ...(ExternalProps as any),
-    componentUrl: 'https://github.com/microsoft/fluentui/tree/master/packages/react-internal/src/components/pickers',
+    componentUrl: 'https://github.com/microsoft/fluentui/tree/master/packages/react/src/components/pickers',
     related,
   },
 };

apps/public-docsite/src/pages/Controls/SeparatorPage/SeparatorPage.tsx

@@ -4,7 +4,7 @@ import { SeparatorPageProps } from './SeparatorPage.doc';
 import { Platforms } from '../../../interfaces/Platforms';
 import { IPageSectionProps } from '@fluentui/react-docsite-components/lib/index2';
 import { ImplementationSection } from '@fluentui/react-docsite-components/lib/index2';
-import { ApiKind } from '@fluentui/react-internal/lib/common/DocPage.types';
+import { ApiKind } from '@fluentui/react/lib/common/DocPage.types';
 
 /* eslint-disable @fluentui/max-len */
 

apps/public-docsite/src/pages/Controls/TextPage/TextPage.tsx

@@ -3,7 +3,7 @@ import { ControlsAreaPage, IControlsPageProps } from '../ControlsAreaPage';
 import { TextPageProps } from './TextPage.doc';
 import { Platforms } from '../../../interfaces/Platforms';
 import { IPageSectionProps, ImplementationSection } from '@fluentui/react-docsite-components/lib/index2';
-import { ApiKind } from '@fluentui/react-internal/lib/common/DocPage.types';
+import { ApiKind } from '@fluentui/react/lib/common/DocPage.types';
 
 /* eslint-disable @fluentui/max-len */
 

apps/public-docsite/src/pages/PageTemplates/TemplatePage/TemplatePage.doc.ts

@@ -59,7 +59,7 @@ export const TemplatePageProps: TFabricPlatformPageProps = {
 
     // Raw import of a types definition file to render the Implementation Section. (Array)
     propertiesTablesSources: [
-      require('!raw-loader?esModule=false!@fluentui/react-internal/src/components/TeachingBubble/TeachingBubble.types.ts') as string,
+      require('!raw-loader?esModule=false!@fluentui/react/src/components/TeachingBubble/TeachingBubble.types.ts') as string,
     ],
   },
 

apps/ssr-tests/test/test.js

@@ -17,7 +17,7 @@ library.setSSR(true);
 library.setRTL(false);
 
 // Assume a large screen.
-let responsiveLib = require('@fluentui/react-internal/lib/utilities/decorators/withResponsiveMode');
+let responsiveLib = require('@fluentui/react/lib/utilities/decorators/withResponsiveMode');
 responsiveLib.setResponsiveMode(responsiveLib.ResponsiveMode.large);
 
 // Initialize icons.

change/@fluentui-api-docs-2021-02-04-10-19-09-no-react-internal.json

@@ -0,0 +1,8 @@
+{
+  "type": "patch",
+  "comment": "Combine react-internal back into react, and update references",
+  "packageName": "@fluentui/api-docs",
+  "email": "[email protected]",
+  "dependentChangeType": "patch",
+  "date": "2021-02-04T18:16:32.747Z"
+}

change/@fluentui-public-docsite-2021-02-04-10-19-09-no-react-internal.json

@@ -0,0 +1,8 @@
+{
+  "type": "patch",
+  "comment": "Combine react-internal back into react, and update references",
+  "packageName": "@fluentui/public-docsite",
+  "email": "[email protected]",
+  "dependentChangeType": "patch",
+  "date": "2021-02-04T18:16:29.583Z"
+}

change/@fluentui-public-docsite-resources-2021-02-04-10-19-09-no-react-internal.json

@@ -0,0 +1,8 @@
+{
+  "type": "patch",
+  "comment": "Combine react-internal back into react, and update references",
+  "packageName": "@fluentui/public-docsite-resources",
+  "email": "[email protected]",
+  "dependentChangeType": "patch",
+  "date": "2021-02-04T18:16:25.267Z"
+}

change/@fluentui-react-internal-2021-02-03-09-20-40-14191.json → change/@fluentui-react-2021-02-03-09-20-40-14191.json

@@ -1,7 +1,7 @@
 {
   "type": "prerelease",
   "comment": "ChoiceGroup: Focus border now visible when focus method is called",
-  "packageName": "@fluentui/react-internal",
+  "packageName": "@fluentui/react",
   "email": "[email protected]",
   "dependentChangeType": "patch",
   "date": "2021-02-03T17:20:40.612Z"

change/@fluentui-react-2021-02-04-10-19-09-no-react-internal.json

@@ -0,0 +1,8 @@
+{
+  "type": "prerelease",
+  "comment": "Combine react-internal back into react (and update references). Move react-date-time components into react to break circular dependency.",
+  "packageName": "@fluentui/react",
+  "email": "[email protected]",
+  "dependentChangeType": "patch",
+  "date": "2021-02-04T18:19:03.880Z"
+}

change/@fluentui-react-internal-2021-02-08-11-06-00-pragma-patch.json → change/@fluentui-react-2021-02-08-11-06-00-pragma-patch.json

@@ -1,7 +1,7 @@
 {
   "type": "prerelease",
   "comment": "Stack/Text: Added additional pragma to set jsxRuntime to classic",
-  "packageName": "@fluentui/react-internal",
+  "packageName": "@fluentui/react",
   "email": "[email protected]",
   "dependentChangeType": "patch",
   "date": "2021-02-08T05:36:00.876Z"

change/@fluentui-react-charting-3dce3474-0d7e-4154-a41c-796dd5a4c9b1.json

@@ -0,0 +1,7 @@
+{
+  "type": "none",
+  "comment": "Remove unused eslint-disables",
+  "packageName": "@fluentui/react-charting",
+  "email": "[email protected]",
+  "dependentChangeType": "none"
+}

change/@fluentui-react-date-time-2021-02-04-10-19-09-no-react-internal.json

@@ -0,0 +1,8 @@
+{
+  "type": "prerelease",
+  "comment": "[BREAKING] Move components to @fluentui/react and re-export from there (working around a circular dependency)",
+  "packageName": "@fluentui/react-date-time",
+  "email": "[email protected]",
+  "dependentChangeType": "patch",
+  "date": "2021-02-04T18:17:02.310Z"
+}

change/@fluentui-react-docsite-components-2021-02-04-10-19-09-no-react-internal.json

@@ -0,0 +1,8 @@
+{
+  "type": "prerelease",
+  "comment": "Combine react-internal back into react, and update references",
+  "packageName": "@fluentui/react-docsite-components",
+  "email": "[email protected]",
+  "dependentChangeType": "patch",
+  "date": "2021-02-04T18:17:59.790Z"
+}

change/@fluentui-react-examples-2021-02-04-10-19-09-no-react-internal.json

@@ -0,0 +1,8 @@
+{
+  "type": "patch",
+  "comment": "Move react-date-time docs into react package; update references to react-internal to point to react",
+  "packageName": "@fluentui/react-examples",
+  "email": "[email protected]",
+  "dependentChangeType": "patch",
+  "date": "2021-02-04T18:18:43.995Z"
+}

change/@fluentui-react-experiments-2021-02-04-10-19-09-no-react-internal.json

@@ -0,0 +1,8 @@
+{
+  "type": "prerelease",
+  "comment": "Combine react-internal back into react, and update references",
+  "packageName": "@fluentui/react-experiments",
+  "email": "[email protected]",
+  "dependentChangeType": "patch",
+  "date": "2021-02-04T18:18:50.383Z"
+}

change/@fluentui-react-monaco-editor-2021-02-04-10-19-09-no-react-internal.json

@@ -0,0 +1,8 @@
+{
+  "type": "prerelease",
+  "comment": "Combine react-internal back into react, and update references",
+  "packageName": "@fluentui/react-monaco-editor",
+  "email": "[email protected]",
+  "dependentChangeType": "patch",
+  "date": "2021-02-04T18:18:53.072Z"
+}