From 567c8faca9ebfc34d5a8e6245984f436b8a12138 Mon Sep 17 00:00:00 2001 From: Thomas Michon Date: Tue, 17 Apr 2018 09:09:31 -0700 Subject: [PATCH 1/2] Fixed improper imports from index files --- .../Shimmer/ShimmerTile/ShimmerTile.base.tsx | 4 ++-- .../ActivityItem/ActivityItem.test.tsx | 16 ++++++++-------- .../src/components/Persona/Persona.types.ts | 4 ++-- .../Persona/PersonaCoin/PersonaCoin.base.tsx | 6 +++--- .../PersonaPresence/PersonaPresence.base.tsx | 2 +- .../src/components/Persona/index.ts | 2 +- 6 files changed, 17 insertions(+), 17 deletions(-) diff --git a/packages/experiments/src/components/Shimmer/ShimmerTile/ShimmerTile.base.tsx b/packages/experiments/src/components/Shimmer/ShimmerTile/ShimmerTile.base.tsx index 09eb5e2f5b8c5e..76ec1eb52a549a 100644 --- a/packages/experiments/src/components/Shimmer/ShimmerTile/ShimmerTile.base.tsx +++ b/packages/experiments/src/components/Shimmer/ShimmerTile/ShimmerTile.base.tsx @@ -8,7 +8,7 @@ import { IShimmerTileStyleProps, IShimmerTileStyles } from './ShimmerTile.types'; -import { TileLayoutSizes, TileSize } from '../../Tile'; +import { TileLayoutSizes, TileSize } from '../../../Tile'; import { ShimmerGap } from '../ShimmerGap/ShimmerGap'; import { getRenderedElements } from '../Shimmer.base'; import { ShimmerElementType as ElemType } from '../Shimmer.types'; @@ -219,4 +219,4 @@ export class ShimmerTileBase extends BaseComponent { ); } -} \ No newline at end of file +} diff --git a/packages/office-ui-fabric-react/src/components/ActivityItem/ActivityItem.test.tsx b/packages/office-ui-fabric-react/src/components/ActivityItem/ActivityItem.test.tsx index 462414f66dd3dc..e27dcbb687ee9f 100644 --- a/packages/office-ui-fabric-react/src/components/ActivityItem/ActivityItem.test.tsx +++ b/packages/office-ui-fabric-react/src/components/ActivityItem/ActivityItem.test.tsx @@ -2,7 +2,7 @@ import * as React from 'react'; import * as renderer from 'react-test-renderer'; import { ActivityItem } from './ActivityItem'; -import { Icon } from '../Icon'; +import { Icon } from '../../Icon'; import { TestImages } from '../../common/TestImages'; const defaultProps = { @@ -34,7 +34,7 @@ describe('ActivityItem', () => { it('renders with an icon correctly', () => { const component = renderer.create( } /> ); @@ -45,7 +45,7 @@ describe('ActivityItem', () => { it('renders with a single persona correctly', () => { const component = renderer.create( ); @@ -56,7 +56,7 @@ describe('ActivityItem', () => { it('renders with multiple personas correctly', () => { const component = renderer.create( ); @@ -67,7 +67,7 @@ describe('ActivityItem', () => { it('renders compact with an icon correctly', () => { const component = renderer.create( } isCompact={ true } /> @@ -79,7 +79,7 @@ describe('ActivityItem', () => { it('renders compact with a single persona correctly', () => { const component = renderer.create( @@ -91,7 +91,7 @@ describe('ActivityItem', () => { it('renders compact with multiple personas correctly', () => { const component = renderer.create( @@ -100,4 +100,4 @@ describe('ActivityItem', () => { expect(tree).toMatchSnapshot(); }); -}); \ No newline at end of file +}); diff --git a/packages/office-ui-fabric-react/src/components/Persona/Persona.types.ts b/packages/office-ui-fabric-react/src/components/Persona/Persona.types.ts index c9baa333da78e3..e473b6d5967245 100644 --- a/packages/office-ui-fabric-react/src/components/Persona/Persona.types.ts +++ b/packages/office-ui-fabric-react/src/components/Persona/Persona.types.ts @@ -1,8 +1,8 @@ import * as React from 'react'; import { IRenderFunction } from '../../Utilities'; import { PersonaBase } from './Persona.base'; -import { PersonaCoinBase } from './PersonaCoin'; -import { PersonaPresenceBase } from './PersonaPresence'; +import { PersonaCoinBase } from './PersonaCoin/index'; +import { PersonaPresenceBase } from './PersonaPresence/index'; import { ImageLoadState } from '../../Image'; import { IStyle, ITheme } from '../../Styling'; import { IStyleFunction } from '../../Utilities'; diff --git a/packages/office-ui-fabric-react/src/components/Persona/PersonaCoin/PersonaCoin.base.tsx b/packages/office-ui-fabric-react/src/components/Persona/PersonaCoin/PersonaCoin.base.tsx index c466e9233e2776..c411c653ec4735 100644 --- a/packages/office-ui-fabric-react/src/components/Persona/PersonaCoin/PersonaCoin.base.tsx +++ b/packages/office-ui-fabric-react/src/components/Persona/PersonaCoin/PersonaCoin.base.tsx @@ -9,15 +9,15 @@ import { getRTL, } from '../../../Utilities'; import { mergeStyles } from '../../../Styling'; -import { PersonaPresence } from '../PersonaPresence'; +import { PersonaPresence } from '../PersonaPresence/index'; import { Icon -} from '../../Icon'; +} from '../../../Icon'; import { Image, ImageFit, ImageLoadState -} from '../../Image'; +} from '../../../Image'; import { IPersonaCoinProps, IPersonaCoinStyleProps, diff --git a/packages/office-ui-fabric-react/src/components/Persona/PersonaPresence/PersonaPresence.base.tsx b/packages/office-ui-fabric-react/src/components/Persona/PersonaPresence/PersonaPresence.base.tsx index 4118f8b14044ad..4c7dbe713b3f7d 100644 --- a/packages/office-ui-fabric-react/src/components/Persona/PersonaPresence/PersonaPresence.base.tsx +++ b/packages/office-ui-fabric-react/src/components/Persona/PersonaPresence/PersonaPresence.base.tsx @@ -5,7 +5,7 @@ import { customizable, } from '../../../Utilities'; import { IStyleSet } from '../../../Styling'; -import { Icon } from '../../Icon'; +import { Icon } from '../../../Icon'; import { IPersonaPresenceProps, IPersonaPresenceStyleProps, diff --git a/packages/office-ui-fabric-react/src/components/Persona/index.ts b/packages/office-ui-fabric-react/src/components/Persona/index.ts index c10c0f10b7b519..174942d4a4cd77 100644 --- a/packages/office-ui-fabric-react/src/components/Persona/index.ts +++ b/packages/office-ui-fabric-react/src/components/Persona/index.ts @@ -1,5 +1,5 @@ export * from './Persona'; export * from './Persona.base'; export * from './Persona.types'; -export * from './PersonaCoin'; +export * from './PersonaCoin/index'; export * from './PersonaConsts'; From e08872b0de9ad4709536d53fe46efe091680ed38 Mon Sep 17 00:00:00 2001 From: Thomas Michon Date: Tue, 17 Apr 2018 09:10:01 -0700 Subject: [PATCH 2/2] Update change output --- .../fix-index-imports_2018-04-17-16-09.json | 11 +++++++++++ .../fix-index-imports_2018-04-17-16-09.json | 11 +++++++++++ 2 files changed, 22 insertions(+) create mode 100644 common/changes/@uifabric/experiments/fix-index-imports_2018-04-17-16-09.json create mode 100644 common/changes/office-ui-fabric-react/fix-index-imports_2018-04-17-16-09.json diff --git a/common/changes/@uifabric/experiments/fix-index-imports_2018-04-17-16-09.json b/common/changes/@uifabric/experiments/fix-index-imports_2018-04-17-16-09.json new file mode 100644 index 00000000000000..2a70516fafaade --- /dev/null +++ b/common/changes/@uifabric/experiments/fix-index-imports_2018-04-17-16-09.json @@ -0,0 +1,11 @@ +{ + "changes": [ + { + "packageName": "@uifabric/experiments", + "comment": "Fix improper imports from index files", + "type": "patch" + } + ], + "packageName": "@uifabric/experiments", + "email": "tmichon@microsoft.com" +} \ No newline at end of file diff --git a/common/changes/office-ui-fabric-react/fix-index-imports_2018-04-17-16-09.json b/common/changes/office-ui-fabric-react/fix-index-imports_2018-04-17-16-09.json new file mode 100644 index 00000000000000..5f04bd3d9406fb --- /dev/null +++ b/common/changes/office-ui-fabric-react/fix-index-imports_2018-04-17-16-09.json @@ -0,0 +1,11 @@ +{ + "changes": [ + { + "packageName": "office-ui-fabric-react", + "comment": "Fix improper imports from index files", + "type": "patch" + } + ], + "packageName": "office-ui-fabric-react", + "email": "tmichon@microsoft.com" +} \ No newline at end of file