Remove @uifabric/legacy, move controls to OUFR (#9307)

microsoft · May 31, 2019 · 1226e08 · 1226e08
1 parent 1dbb8a9
commit 1226e08
Show file tree

Hide file tree

Showing 126 changed files with 571 additions and 1,035 deletions.
diff --git a/apps/fabric-website-resources/package.json b/apps/fabric-website-resources/package.json
@@ -64,7 +64,6 @@
     "@uifabric/example-app-base": "^6.23.1",
     "@uifabric/fluent-theme": "^0.16.10",
     "@uifabric/icons": "^6.5.2",
-    "@uifabric/legacy": "^6.164.5",
     "@uifabric/merge-styles": "^6.17.4",
     "@uifabric/set-version": "^1.1.3",
     "@uifabric/styling": "^6.47.6",

diff --git a/apps/fabric-website-resources/src/ComponentStatus/AllComponents.checklist.ts b/apps/fabric-website-resources/src/ComponentStatus/AllComponents.checklist.ts
@@ -30,7 +30,7 @@ export const AllComponentsStatus: IComponentStatusState = {
   List: require<any>('office-ui-fabric-react/lib/components/List/List.checklist').ListStatus,
   MessageBar: require<any>('office-ui-fabric-react/lib/components/MessageBar/MessageBar.checklist').MessageBarStatus,
   Modal: require<any>('office-ui-fabric-react/lib/components/Modal/Modal.checklist').ModalStatus,
-  Nav: require<any>('@uifabric/legacy/lib/components/Nav/Nav.checklist').NavStatus,
+  Nav: require<any>('office-ui-fabric-react/lib/components/Nav/Nav.checklist').NavStatus,
   Overlay: require<any>('office-ui-fabric-react/lib/components/Overlay/Overlay.checklist').OverlayStatus,
   OverflowSet: require<any>('office-ui-fabric-react/lib/components/OverflowSet/OverflowSet.checklist').OverflowSetStatus,
   Panel: require<any>('office-ui-fabric-react/lib/components/Panel/Panel.checklist').PanelStatus,

diff --git a/apps/fabric-website-resources/src/components/pages/CalendarPage.tsx b/apps/fabric-website-resources/src/components/pages/CalendarPage.tsx
@@ -1,5 +1,5 @@
 import * as React from 'react';
-import { CalendarPageProps } from '@uifabric/legacy/lib/components/Calendar/Calendar.doc';
+import { CalendarPageProps } from 'office-ui-fabric-react/lib/components/Calendar/Calendar.doc';
 import { DemoPage } from '../DemoPage';
 
 export const CalendarPage = (props: { isHeaderVisible: boolean }) => (

diff --git a/apps/fabric-website-resources/src/components/pages/DatePickerPage.tsx b/apps/fabric-website-resources/src/components/pages/DatePickerPage.tsx
@@ -1,7 +1,7 @@
 import * as React from 'react';
 
 import { DemoPage } from '../DemoPage';
-import { DatePickerPageProps } from '@uifabric/legacy/lib/components/DatePicker/DatePicker.doc';
+import { DatePickerPageProps } from 'office-ui-fabric-react/lib/components/DatePicker/DatePicker.doc';
 
 export const DatePickerPage = (props: { isHeaderVisible: boolean }) => (
   <DemoPage

diff --git a/apps/fabric-website-resources/src/components/pages/NavPage.tsx b/apps/fabric-website-resources/src/components/pages/NavPage.tsx
@@ -1,7 +1,7 @@
 import * as React from 'react';
 import { DemoPage } from '../DemoPage';
 
-import { NavPageProps } from '@uifabric/legacy/lib/components/Nav/Nav.doc';
+import { NavPageProps } from 'office-ui-fabric-react/lib/components/Nav/Nav.doc';
 
 export const NavPage = (props: { isHeaderVisible: boolean }) => (
   <DemoPage jsonDocs={require('@uifabric/api-docs/lib/pages/office-ui-fabric-react/Nav.page.json')} {...{ ...NavPageProps, ...props }} />

diff --git a/apps/fabric-website-resources/webpack.config.js b/apps/fabric-website-resources/webpack.config.js
@@ -24,9 +24,6 @@ module.exports = [
 
     resolve: {
       alias: {
-        '@uifabric/legacy$': path.resolve(__dirname, '../../packages/legacy/lib'),
-        '@uifabric/legacy/src': path.resolve(__dirname, '../../packages/legacy/src'),
-        '@uifabric/legacy/lib': path.resolve(__dirname, '../../packages/legacy/lib'),
         'office-ui-fabric-react$': path.resolve(__dirname, '../../packages/office-ui-fabric-react/lib'),
         'office-ui-fabric-react/src': path.resolve(__dirname, '../../packages/office-ui-fabric-react/src'),
         'office-ui-fabric-react/lib': path.resolve(__dirname, '../../packages/office-ui-fabric-react/lib'),

diff --git a/apps/fabric-website-resources/webpack.serve.config.js b/apps/fabric-website-resources/webpack.serve.config.js
@@ -15,9 +15,6 @@ module.exports = resources.createServeConfig({
 
   resolve: {
     alias: {
-      '@uifabric/legacy$': path.resolve(__dirname, '../../packages/legacy/src'),
-      '@uifabric/legacy/src': path.resolve(__dirname, '../../packages/legacy/src'),
-      '@uifabric/legacy/lib': path.resolve(__dirname, '../../packages/legacy/src'),
       'office-ui-fabric-react$': path.resolve(__dirname, '../../packages/office-ui-fabric-react/src'),
       'office-ui-fabric-react/src': path.resolve(__dirname, '../../packages/office-ui-fabric-react/src'),
       'office-ui-fabric-react/lib': path.resolve(__dirname, '../../packages/office-ui-fabric-react/src'),

diff --git a/apps/fabric-website/package.json b/apps/fabric-website/package.json
@@ -51,7 +51,6 @@
     "@uifabric/file-type-icons": "^6.4.10",
     "@uifabric/fluent-theme": "^0.16.10",
     "@uifabric/icons": "^6.5.2",
-    "@uifabric/legacy": "^6.164.5",
     "@uifabric/set-version": "^1.1.3",
     "@uifabric/theme-samples": "^0.1.6",
     "react-app-polyfill": "~1.0.1",

diff --git a/apps/fabric-website/src/pages/Controls/CalendarPage/CalendarPage.doc.ts b/apps/fabric-website/src/pages/Controls/CalendarPage/CalendarPage.doc.ts
@@ -1,5 +1,5 @@
 import { TFabricPlatformPageProps } from '../../../interfaces/Platforms';
-import { CalendarPageProps as ExternalProps } from '@uifabric/legacy/lib/components/Calendar/Calendar.doc';
+import { CalendarPageProps as ExternalProps } from 'office-ui-fabric-react/lib/components/Calendar/Calendar.doc';
 
 const related = require('!raw-loader!@uifabric/fabric-website/src/pages/Controls/CalendarPage/docs/CalendarRelated.md') as string;
 const componentUrl = 'https://github.com/OfficeDev/office-ui-fabric-react/tree/master/apps/fabric-website/src/pages/Controls/CalendarPage';

diff --git a/apps/fabric-website/src/pages/Controls/DatePickerPage/DatePickerPage.doc.ts b/apps/fabric-website/src/pages/Controls/DatePickerPage/DatePickerPage.doc.ts
@@ -1,5 +1,5 @@
 import { TFabricPlatformPageProps } from '../../../interfaces/Platforms';
-import { DatePickerPageProps as ExternalProps } from '@uifabric/legacy/lib/components/DatePicker/DatePicker.doc';
+import { DatePickerPageProps as ExternalProps } from 'office-ui-fabric-react/lib/components/DatePicker/DatePicker.doc';
 
 const related = require('!raw-loader!@uifabric/fabric-website/src/pages/Controls/DatePickerPage/docs/DatePickerRelated.md') as string;
 const componentUrl =

diff --git a/apps/fabric-website/src/pages/Controls/NavPage/NavPage.doc.ts b/apps/fabric-website/src/pages/Controls/NavPage/NavPage.doc.ts
@@ -1,5 +1,5 @@
 import { TFabricPlatformPageProps } from '../../../interfaces/Platforms';
-import { NavPageProps as ExternalProps } from '@uifabric/legacy/lib/components/Nav/Nav.doc';
+import { NavPageProps as ExternalProps } from 'office-ui-fabric-react/lib/components/Nav/Nav.doc';
 
 const related = require('!raw-loader!@uifabric/fabric-website/src/pages/Controls/NavPage/docs/NavRelated.md') as string;
 

diff --git a/apps/fabric-website/webpack.config.js b/apps/fabric-website/webpack.config.js
@@ -47,9 +47,6 @@ module.exports = function(env) {
           'office-ui-fabric-react$': path.join(__dirname, 'node_modules/office-ui-fabric-react/lib'),
           'office-ui-fabric-react/src': path.join(__dirname, 'node_modules/office-ui-fabric-react/src'),
           'office-ui-fabric-react/lib': path.join(__dirname, 'node_modules/office-ui-fabric-react/lib'),
-          '@uifabric/legacy$': path.join(__dirname, 'node_modules/@uifabric/legacy/lib'),
-          '@uifabric/legacy/src': path.join(__dirname, 'node_modules/@uifabric/legacy/src'),
-          '@uifabric/legacy/lib': path.join(__dirname, 'node_modules/@uifabric/legacy/lib'),
           '@uifabric/api-docs/lib': path.join(__dirname, 'node_modules/@uifabric/api-docs/lib')
         }
       }

diff --git a/apps/fabric-website/webpack.serve.config.js b/apps/fabric-website/webpack.serve.config.js
@@ -24,9 +24,6 @@ module.exports = resources.createServeConfig({
 
   resolve: {
     alias: {
-      '@uifabric/legacy$': path.resolve(__dirname, '../../packages/legacy/src'),
-      '@uifabric/legacy/lib': path.resolve(__dirname, '../../packages/legacy/src'),
-      '@uifabric/legacy/src': path.resolve(__dirname, '../../packages/legacy/src'),
       '@uifabric/fabric-website/src': path.join(__dirname, 'src'),
       '@uifabric/fabric-website/lib': path.join(__dirname, 'lib'),
       '@uifabric/example-app-base$': path.resolve(__dirname, '../../packages/example-app-base/src'),

diff --git a/apps/ssr-tests/package.json b/apps/ssr-tests/package.json
@@ -23,7 +23,6 @@
     "@types/webpack-env": "1.13.9",
     "@microsoft/load-themed-styles": "^1.7.13",
     "@uifabric/fabric-website-resources": "^6.18.3",
-    "@uifabric/legacy": "^6.164.5",
     "@uifabric/prettier-rules": "^1.0.2",
     "mocha": "^3.3.0",
     "office-ui-fabric-react": "^6.187.1",

diff --git a/apps/ssr-tests/webpack.config.js b/apps/ssr-tests/webpack.config.js
@@ -21,9 +21,6 @@ module.exports = resources.createConfig('ssr-tests', false, {
       'office-ui-fabric-react$': path.join(__dirname, 'node_modules/office-ui-fabric-react/lib'),
       '@uifabric/fabric-website-resources/src': path.join(__dirname, 'node_modules/@uifabric/fabric-website-resources/src'),
       '@uifabric/fabric-website-resources/lib': path.join(__dirname, 'node_modules/@uifabric/fabric-website-resources/lib'),
-      '@uifabric/legacy$': path.join(__dirname, 'node_modules/@uifabric/legacy/lib'),
-      '@uifabric/legacy/src': path.join(__dirname, 'node_modules/@uifabric/legacy/src'),
-      '@uifabric/legacy/lib': path.join(__dirname, 'node_modules/@uifabric/legacy/lib'),
       '@uifabric/styling/lib': path.join(__dirname, '../../packages/styling/lib'),
       'Props.ts.js': 'Props'
     }

diff --git a/apps/vr-tests/package.json b/apps/vr-tests/package.json
@@ -42,7 +42,6 @@
   "dependencies": {
     "@uifabric/experiments": "^6.78.2",
     "@uifabric/set-version": "^1.1.3",
-    "@uifabric/legacy": "^6.164.5",
     "@uifabric/react-cards": "^0.3.1",
     "office-ui-fabric-react": "^6.187.1",
     "react": ">=16.8.0 <17.0.0",

diff --git a/apps/vr-tests/src/stories/DatePicker.stories.tsx b/apps/vr-tests/src/stories/DatePicker.stories.tsx
@@ -4,7 +4,7 @@ import Screener from 'screener-storybook/src/screener';
 import { storiesOf } from '@storybook/react';
 import { FabricDecoratorFixedWidth } from '../utilities';
 import { Fabric } from 'office-ui-fabric-react';
-import { DatePicker } from '@uifabric/legacy';
+import { DatePicker } from 'office-ui-fabric-react';
 
 const date = new Date(2010, 1, 12);
 storiesOf('DatePicker', module)

diff --git a/apps/vr-tests/src/stories/Nav.stories.tsx b/apps/vr-tests/src/stories/Nav.stories.tsx
@@ -3,7 +3,7 @@ import * as React from 'react';
 import Screener from 'screener-storybook/src/screener';
 import { storiesOf } from '@storybook/react';
 import { FabricDecorator } from '../utilities';
-import { Nav, INavLink } from '@uifabric/legacy/lib/Nav';
+import { Nav, INavLink } from 'office-ui-fabric-react/lib/Nav';
 
 const links: INavLink[] = [
   {

diff --git a/common/changes/@uifabric/api-docs/remove-legacy_2019-05-31-21-33.json b/common/changes/@uifabric/api-docs/remove-legacy_2019-05-31-21-33.json
@@ -0,0 +1,11 @@
+{
+  "changes": [
+    {
+      "packageName": "@uifabric/api-docs",
+      "comment": "Remove reference to legacy package",
+      "type": "patch"
+    }
+  ],
+  "packageName": "@uifabric/api-docs",
+  "email": "[email protected]"
+}
diff --git a/common/changes/@uifabric/azure-themes/remove-legacy_2019-05-31-21-33.json b/common/changes/@uifabric/azure-themes/remove-legacy_2019-05-31-21-33.json
@@ -0,0 +1,11 @@
+{
+  "changes": [
+    {
+      "packageName": "@uifabric/azure-themes",
+      "comment": "Nav, Calendar, and DatePicker move into office-ui-fabric-react",
+      "type": "patch"
+    }
+  ],
+  "packageName": "@uifabric/azure-themes",
+  "email": "[email protected]"
+}
diff --git a/common/changes/@uifabric/example-app-base/remove-legacy_2019-05-31-21-33.json b/common/changes/@uifabric/example-app-base/remove-legacy_2019-05-31-21-33.json
@@ -0,0 +1,11 @@
+{
+  "changes": [
+    {
+      "packageName": "@uifabric/example-app-base",
+      "comment": "Nav, Calendar, and DatePicker move into office-ui-fabric-react",
+      "type": "patch"
+    }
+  ],
+  "packageName": "@uifabric/example-app-base",
+  "email": "[email protected]"
+}
diff --git a/common/changes/@uifabric/fabric-website-resources/remove-legacy_2019-05-31-21-33.json b/common/changes/@uifabric/fabric-website-resources/remove-legacy_2019-05-31-21-33.json
@@ -0,0 +1,11 @@
+{
+  "changes": [
+    {
+      "packageName": "@uifabric/fabric-website-resources",
+      "comment": "Nav, Calendar, and DatePicker move into office-ui-fabric-react",
+      "type": "patch"
+    }
+  ],
+  "packageName": "@uifabric/fabric-website-resources",
+  "email": "[email protected]"
+}
diff --git a/common/changes/@uifabric/fabric-website/remove-legacy_2019-05-31-21-33.json b/common/changes/@uifabric/fabric-website/remove-legacy_2019-05-31-21-33.json
@@ -0,0 +1,11 @@
+{
+  "changes": [
+    {
+      "packageName": "@uifabric/fabric-website",
+      "comment": "Nav, Calendar, and DatePicker move into office-ui-fabric-react",
+      "type": "patch"
+    }
+  ],
+  "packageName": "@uifabric/fabric-website",
+  "email": "[email protected]"
+}
diff --git a/common/changes/@uifabric/fluent-theme/remove-legacy_2019-05-31-21-33.json b/common/changes/@uifabric/fluent-theme/remove-legacy_2019-05-31-21-33.json
@@ -0,0 +1,11 @@
+{
+  "changes": [
+    {
+      "packageName": "@uifabric/fluent-theme",
+      "comment": "Nav, Calendar, and DatePicker move into office-ui-fabric-react",
+      "type": "patch"
+    }
+  ],
+  "packageName": "@uifabric/fluent-theme",
+  "email": "[email protected]"
+}
diff --git a/common/changes/@uifabric/legacy/calendar_2019-05-29-18-08.json b/common/changes/@uifabric/legacy/calendar_2019-05-29-18-08.json
diff --git a/common/changes/@uifabric/legacy/calendar_2019-05-29-18-11.json b/common/changes/@uifabric/legacy/calendar_2019-05-29-18-11.json
diff --git a/common/changes/@uifabric/legacy/jg-dedupe-react-deps_2019-05-06-20-19.json b/common/changes/@uifabric/legacy/jg-dedupe-react-deps_2019-05-06-20-19.json
diff --git a/common/changes/@uifabric/legacy/nav-props_2019-05-29-18-07.json b/common/changes/@uifabric/legacy/nav-props_2019-05-29-18-07.json
diff --git a/common/changes/@uifabric/migration/remove-legacy_2019-05-31-21-33.json b/common/changes/@uifabric/migration/remove-legacy_2019-05-31-21-33.json
@@ -0,0 +1,11 @@
+{
+  "changes": [
+    {
+      "packageName": "@uifabric/migration",
+      "comment": "Remove migration for nav to legacy",
+      "type": "patch"
+    }
+  ],
+  "packageName": "@uifabric/migration",
+  "email": "[email protected]"
+}
diff --git a/common/changes/office-ui-fabric-react/remove-legacy_2019-05-31-21-33.json b/common/changes/office-ui-fabric-react/remove-legacy_2019-05-31-21-33.json
@@ -0,0 +1,11 @@
+{
+  "changes": [
+    {
+      "packageName": "office-ui-fabric-react",
+      "comment": "Nav, Calendar, and DatePicker move into office-ui-fabric-react",
+      "type": "patch"
+    }
+  ],
+  "packageName": "office-ui-fabric-react",
+  "email": "[email protected]"
+}