Skip to content

Commit

Permalink
Rename @uifabric/icons to @fluentui/font-icons-mdl2 (microsoft#15603)
Browse files Browse the repository at this point in the history
  • Loading branch information
tomi-msft committed Oct 20, 2020
1 parent 1f144ce commit d3bafa5
Show file tree
Hide file tree
Showing 125 changed files with 126 additions and 45 deletions.
2 changes: 1 addition & 1 deletion .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ packages/eslint-plugin/ @ecraig12345
packages/example-app-base/ @ecraig12345
packages/file-type-icons/ @KatherineThayerMicrosoft @jahnp @bigbadcapers
packages/foundation-legacy/ @dzearing @khmakoto
# packages/icons/
# packages/font-icons-mdl2/
# packages/jest-serializer-merge-styles/
packages/merge-styles/ @dzearing
packages/monaco-editor/ @ecraig12345
Expand Down
2 changes: 1 addition & 1 deletion apps/a11y-tests/config/tests.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ const path = require('path');
const mkdirp = require('mkdirp');

// Initialize icons
const { initializeIcons } = require('@uifabric/icons');
const { initializeIcons } = require('@fluentui/font-icons-mdl2');
initializeIcons();

// Create `dist/reports` folder to save SARIF reports
Expand Down
2 changes: 1 addition & 1 deletion apps/a11y-tests/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,6 @@
"@types/react-dom": "16.8.4",
"@types/sarif": "^2.1.1",
"@uifabric/build": "^7.0.0",
"@uifabric/icons": "^7.5.8"
"@fluentui/font-icons-mdl2": "^7.5.8"
}
}
2 changes: 1 addition & 1 deletion apps/public-docsite-resources/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
"@uifabric/api-docs": "^7.5.18",
"@fluentui/azure-themes": "^7.5.18",
"@uifabric/example-app-base": "^7.15.18",
"@uifabric/icons": "^7.5.8",
"@fluentui/font-icons-mdl2": "^7.5.8",
"@uifabric/set-version": "^7.0.23",
"@fluentui/theme-samples": "^7.1.21",
"@uifabric/tsx-editor": "^0.13.18",
Expand Down
2 changes: 1 addition & 1 deletion apps/public-docsite/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
"@fluentui/react-experiments": "^7.33.1",
"@fluentui/public-docsite-resources": "^7.8.18",
"@uifabric/file-type-icons": "^7.6.9",
"@uifabric/icons": "^7.5.8",
"@fluentui/font-icons-mdl2": "^7.5.8",
"@uifabric/set-version": "^7.0.23",
"@fluentui/theme-samples": "^7.1.21",
"json-loader": "^0.5.7",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import { Platforms } from '../../../interfaces/Platforms';
const baseUrl =
'https://github.com/microsoft/fluentui/tree/master/apps/public-docsite/src/pages/Styles/FabricIconsPage/docs';
const fabricCoreIcons = require('office-ui-fabric-core/src/data/icons.json');
const fabricReactIcons = require('@uifabric/icons/lib/data/AllIconNames.json');
const fabricReactIcons = require('@fluentui/font-icons-mdl2/lib/data/AllIconNames.json');
// en dashes look like regular dashes in a monospace font
const enDash = '–';

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@ You can use Fluent UI's icons in a few ways, depending on if you're using Fluent

### Fluent UI React

If you're using Fluent UI React, note that icons are not included in your bundle by default. To make the icons available, you'll need to initialize them by calling `initializeIcons` from the `@uifabric/icons` package. This is usually done at the root of your app:
If you're using Fluent UI React, note that icons are not included in your bundle by default. To make the icons available, you'll need to initialize them by calling `initializeIcons` from the `@fluentui/font-icons-mdl2` package. This is usually done at the root of your app:

```ts
import { initializeIcons } from '@uifabric/icons';
import { initializeIcons } from '@fluentui/font-icons-mdl2';
initializeIcons();
```

Expand Down
2 changes: 1 addition & 1 deletion apps/public-docsite/src/utilities/createSite.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import * as React from 'react';
import * as ReactDOM from 'react-dom';
import { Fabric, setBaseUrl } from '@fluentui/react';
import { initializeIcons } from '@uifabric/icons/lib/index';
import { initializeIcons } from '@fluentui/font-icons-mdl2/lib/index';
import {
INavPage,
ISiteDefinition,
Expand Down
2 changes: 1 addition & 1 deletion apps/server-rendered-app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
},
"dependencies": {
"@microsoft/load-themed-styles": "^1.10.26",
"@uifabric/icons": "^7.5.8",
"@fluentui/font-icons-mdl2": "^7.5.8",
"@uifabric/merge-styles": "^7.19.1",
"@uifabric/set-version": "^7.0.23",
"@fluentui/react": "^7.142.0",
Expand Down
2 changes: 1 addition & 1 deletion apps/server-rendered-app/server/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ const React = require('react');
const ReactDOMServer = require('react-dom/server');
const { renderStatic } = require('@uifabric/merge-styles/lib-commonjs/server');
const { configureLoadStyles } = require('@microsoft/load-themed-styles');
const { initializeIcons } = require('@uifabric/icons');
const { initializeIcons } = require('@fluentui/font-icons-mdl2');

const ReactMinScripts =
`<script type="text/javascript" src="//cdnjs.cloudflare.com/ajax/libs/react/16.8.6/umd/react.production.min.js"></script>` +
Expand Down
2 changes: 1 addition & 1 deletion apps/server-rendered-app/src/index.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import * as React from 'react';
import * as ReactDOM from 'react-dom';
import { initializeIcons } from '@uifabric/icons';
import { initializeIcons } from '@fluentui/font-icons-mdl2';

import TodoApp from './TodoApp';

Expand Down
2 changes: 1 addition & 1 deletion apps/theming-designer/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
"@fluentui/foundation-legacy": "^7.9.9",
"@fluentui/scheme-utilities": "^7.2.21",
"@uifabric/set-version": "^7.0.23",
"@uifabric/icons": "^7.5.8",
"@fluentui/font-icons-mdl2": "^7.5.8",
"@microsoft/load-themed-styles": "^1.10.26",
"react": "16.8.6",
"react-app-polyfill": "~1.0.1",
Expand Down
2 changes: 1 addition & 1 deletion apps/theming-designer/src/index.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import * as React from 'react';
import * as ReactDOM from 'react-dom';
import { Fabric } from '@fluentui/react/lib/Fabric';
import { initializeIcons } from '@uifabric/icons';
import { initializeIcons } from '@fluentui/font-icons-mdl2';
import { ThemingDesigner } from './components/ThemingDesigner';

initializeIcons();
Expand Down
1 change: 1 addition & 0 deletions apps/vr-tests/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
"dependencies": {
"@babel/core": "^7.10.4",
"@fluentui/eslint-plugin": "^0.54.1",
"@fluentui/font-icons-mdl2": "^7.5.8",
"@fluentui/react": "^7.142.0",
"@fluentui/react-button": "^0.14.3",
"@fluentui/react-icons": "^0.3.5",
Expand Down
2 changes: 1 addition & 1 deletion apps/vr-tests/src/stories/Icon.stories.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import Screener from 'screener-storybook/src/screener';
import { storiesOf } from '@storybook/react';
import { FabricDecorator } from '../utilities/index';
import { Icon, IconType, getIconClassName, Fabric } from '@fluentui/react';
import * as IconNames from '../../../../packages/icons/src/IconNames';
import * as IconNames from '@fluentui/font-icons-mdl2/src/IconNames';

import { TestImages } from '@uifabric/example-data';

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"type": "minor",
"comment": "Rename @uifabric/icons to @fluentui/font-icons-mdl2",
"packageName": "@fluentui/font-icons-mdl2",
"email": "ololubek@microsoft.com",
"dependentChangeType": "patch",
"date": "2020-10-20T00:40:40.393Z"
}
8 changes: 8 additions & 0 deletions change/@fluentui-react-2020-10-19-17-41-22-icon-rename.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"type": "minor",
"comment": "Rename @uifabric/icons to @fluentui/font-icons-mdl2",
"packageName": "@fluentui/react",
"email": "ololubek@microsoft.com",
"dependentChangeType": "patch",
"date": "2020-10-20T00:41:19.478Z"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"type": "minor",
"comment": "Rename @uifabric/icons to @fluentui/font-icons-mdl2",
"packageName": "@fluentui/react-checkbox",
"email": "ololubek@microsoft.com",
"dependentChangeType": "patch",
"date": "2020-10-20T00:40:46.354Z"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"type": "minor",
"comment": "Rename @uifabric/icons to @fluentui/font-icons-mdl2",
"packageName": "@fluentui/react-experiments",
"email": "ololubek@microsoft.com",
"dependentChangeType": "patch",
"date": "2020-10-20T00:40:48.536Z"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"type": "minor",
"comment": "Rename @uifabric/icons to @fluentui/font-icons-mdl2",
"packageName": "@fluentui/react-internal",
"email": "ololubek@microsoft.com",
"dependentChangeType": "patch",
"date": "2020-10-20T00:40:51.418Z"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"type": "minor",
"comment": "Rename @uifabric/icons to @fluentui/font-icons-mdl2",
"packageName": "@fluentui/react-link",
"email": "ololubek@microsoft.com",
"dependentChangeType": "patch",
"date": "2020-10-20T00:40:55.267Z"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"type": "prerelease",
"comment": "Rename @uifabric/icons to @fluentui/font-icons-mdl2",
"packageName": "@fluentui/react-next",
"email": "ololubek@microsoft.com",
"dependentChangeType": "patch",
"date": "2020-10-20T00:41:04.748Z"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"type": "minor",
"comment": "Rename @uifabric/icons to @fluentui/font-icons-mdl2",
"packageName": "@fluentui/react-tabs",
"email": "ololubek@microsoft.com",
"dependentChangeType": "patch",
"date": "2020-10-20T00:41:08.381Z"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"type": "minor",
"comment": "Rename @uifabric/icons to @fluentui/font-icons-mdl2",
"packageName": "@fluentui/react-toggle",
"email": "ololubek@microsoft.com",
"dependentChangeType": "patch",
"date": "2020-10-20T00:41:15.467Z"
}
2 changes: 1 addition & 1 deletion change/@uifabric-icons-2020-10-15-02-05-19-dep-fixes.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"type": "none",
"comment": "Update npmignore",
"packageName": "@uifabric/icons",
"packageName": "@fluentui/font-icons-mdl2",
"email": "elcraig@microsoft.com",
"dependentChangeType": "none",
"date": "2020-10-15T08:59:44.985Z"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"type": "patch",
"comment": "Rename @uifabric/styling to @fluentui/style-utilities",
"packageName": "@uifabric/icons",
"packageName": "@fluentui/font-icons-mdl2",
"email": "elcraig@microsoft.com",
"dependentChangeType": "patch",
"date": "2020-10-16T22:41:15.800Z"
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"type": "minor",
"comment": "Rename @uifabric/icons to @fluentui/font-icons-mdl2",
"packageName": "@uifabric/tsx-editor",
"email": "ololubek@microsoft.com",
"dependentChangeType": "patch",
"date": "2020-10-20T00:41:22.319Z"
}
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# @uifabric/icons
# @fluentui/font-icons-mdl2

**Icons for [Fluent UI React](https://developer.microsoft.com/en-us/fluentui)**
([formerly Office UI Fabric React](https://developer.microsoft.com/en-us/office/blogs/ui-fabric-is-evolving-into-fluent-ui/))
Expand All @@ -7,10 +7,10 @@ Fluent UI React Icons includes a collection of 1100+ icons which you can use in

## Getting started

If you are using Fluent UI React components, you can make all icons available by calling the `initializeIcons` function from the `@uifabric/icons` package:
If you are using Fluent UI React components, you can make all icons available by calling the `initializeIcons` function from the `@fluentui/font-icons-mdl2` package:

```tsx
import { initializeIcons } from '@uifabric/icons';
import { initializeIcons } from '@fluentui/font-icons-mdl2';

// Register icons and pull the fonts from the default SharePoint cdn.
initializeIcons();
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
## API Report File for "@uifabric/icons"
## API Report File for "@fluentui/font-icons-mdl2"

> Do not edit this file. It is a report generated by [API Extractor](https://api-extractor.com/).
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"name": "@uifabric/icons",
"name": "@fluentui/font-icons-mdl2",
"version": "7.5.8",
"description": "Fluent UI React icon set.",
"main": "lib-commonjs/index.js",
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Do not modify this file; it is generated as part of publish.
// The checked in version is a placeholder only and will not be updated.
import { setVersion } from '@uifabric/set-version';
setVersion('@uifabric/icons', '0.0.0');
setVersion('@fluentui/font-icons-mdl2', '0.0.0');
File renamed without changes.
2 changes: 1 addition & 1 deletion packages/react-checkbox/config/tests.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/** Jest test setup file. */

const { configure } = require('enzyme');
const { initializeIcons } = require('@uifabric/icons');
const { initializeIcons } = require('@fluentui/font-icons-mdl2');
const { resetIds } = require('@uifabric/utilities');
const Adapter = require('enzyme-adapter-react-16');

Expand Down
2 changes: 1 addition & 1 deletion packages/react-examples/.storybook/preview.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// @ts-check
import * as React from 'react';
import { initializeIcons } from '@uifabric/icons';
import { initializeIcons } from '@fluentui/font-icons-mdl2';
import { configure, addParameters, addDecorator } from '@storybook/react';
import { withInfo } from '@storybook/addon-info';
import { withA11y } from '@storybook/addon-a11y';
Expand Down
2 changes: 1 addition & 1 deletion packages/react-examples/config/tests.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/** Jest test setup file. */

const { configure } = require('enzyme');
const { initializeIcons } = require('@uifabric/icons');
const { initializeIcons } = require('@fluentui/font-icons-mdl2');
const Adapter = require('enzyme-adapter-react-16');

// Initialize icons.
Expand Down
2 changes: 1 addition & 1 deletion packages/react-examples/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@
"@fluentui/react-experiments": "^7.33.1",
"@uifabric/file-type-icons": "^7.6.9",
"@fluentui/foundation-legacy": "^7.9.9",
"@uifabric/icons": "^7.5.8",
"@fluentui/font-icons-mdl2": "^7.5.8",
"@uifabric/merge-styles": "^7.19.1",
"@fluentui/react-cards": "^0.113.3",
"@uifabric/react-hooks": "^7.13.5",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ In a user interface, an icon is an image that represents an application, a capab

For a list of icons, visit our [icon documentation](#/styles/web/icons).

Note that icons are not bundled by default and typically must be loaded by calling `initializeIcons` from the `@uifabric/icons` package at the root of your application. See the [icon documentation](#/styles/web/icons#fabric-react) for more details.
Note that icons are not bundled by default and typically must be loaded by calling `initializeIcons` from `@fluentui/react/lib/Icons` at the root of your application. See the [icon documentation](#/styles/web/icons#fabric-react) for more details.
2 changes: 1 addition & 1 deletion packages/react-experiments/config/tests.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/** Jest test setup file. */

const { setIconOptions } = require('@fluentui/react/lib/Styling');
const { initializeIcons } = require('@uifabric/icons');
const { initializeIcons } = require('@fluentui/font-icons-mdl2');
const { configure } = require('enzyme');
const Adapter = require('enzyme-adapter-react-16');

Expand Down
2 changes: 1 addition & 1 deletion packages/react-experiments/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@
"@microsoft/load-themed-styles": "^1.10.26",
"@uifabric/example-data": "^7.1.5",
"@fluentui/foundation-legacy": "^7.9.9",
"@uifabric/icons": "^7.5.8",
"@fluentui/font-icons-mdl2": "^7.5.8",
"@uifabric/merge-styles": "^7.19.1",
"@uifabric/react-hooks": "^7.13.5",
"@uifabric/set-version": "^7.0.23",
Expand Down
2 changes: 1 addition & 1 deletion packages/react-internal/config/tests.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/** Jest test setup file. */

const { configure } = require('enzyme');
const { initializeIcons } = require('@uifabric/icons');
const { initializeIcons } = require('@fluentui/font-icons-mdl2');
const Adapter = require('enzyme-adapter-react-16');

// Initialize icons.
Expand Down
2 changes: 1 addition & 1 deletion packages/react-internal/etc/react-internal.api.md
Original file line number Diff line number Diff line change
Expand Up @@ -6996,11 +6996,11 @@ export enum ValidationState {
export const VerticalDivider: React.FunctionComponent<IVerticalDividerProps>;


export * from "@fluentui/font-icons-mdl2";
export * from "@fluentui/react-focus";
export * from "@fluentui/react-theme-provider";
export * from "@fluentui/style-utilities";
export * from "@fluentui/theme";
export * from "@uifabric/icons";
export * from "@uifabric/utilities";

// Warnings were encountered during analysis:
Expand Down
2 changes: 1 addition & 1 deletion packages/react-internal/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@
"@microsoft/load-themed-styles": "^1.10.26",
"@fluentui/date-time-utilities": "^7.9.0",
"@fluentui/foundation-legacy": "^7.9.9",
"@uifabric/icons": "^7.5.8",
"@fluentui/font-icons-mdl2": "^7.5.8",
"@uifabric/merge-styles": "^7.19.1",
"@uifabric/react-hooks": "^7.13.5",
"@uifabric/set-version": "^7.0.23",
Expand Down
2 changes: 1 addition & 1 deletion packages/react-internal/src/Icons.ts
Original file line number Diff line number Diff line change
@@ -1 +1 @@
export * from '@uifabric/icons';
export * from '@fluentui/font-icons-mdl2';
2 changes: 1 addition & 1 deletion packages/react-link/config/tests.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/** Jest test setup file. */

const { configure } = require('enzyme');
const { initializeIcons } = require('@uifabric/icons');
const { initializeIcons } = require('@fluentui/font-icons-mdl2');
const Adapter = require('enzyme-adapter-react-16');
const { resetIds } = require('@uifabric/utilities');

Expand Down
2 changes: 1 addition & 1 deletion packages/react-next/config/tests.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/** Jest test setup file. */

const { configure } = require('enzyme');
const { initializeIcons } = require('@uifabric/icons');
const { initializeIcons } = require('@fluentui/font-icons-mdl2');
const Adapter = require('enzyme-adapter-react-16');
const { resetIds } = require('@fluentui/react-next');

Expand Down
Loading

0 comments on commit d3bafa5

Please sign in to comment.