Rename @uifabric/merge-styles to @fluentui/merge-styles (microsoft#15627

)

apps/server-rendered-app/package.json

@@ -28,7 +28,7 @@
   "dependencies": {
     "@microsoft/load-themed-styles": "^1.10.26",
     "@fluentui/font-icons-mdl2": "^7.5.8",
-    "@uifabric/merge-styles": "^7.19.1",
+    "@fluentui/merge-styles": "^7.19.1",
     "@fluentui/set-version": "^7.0.23",
     "@fluentui/react": "^7.142.0",
     "react": "16.8.6",

apps/server-rendered-app/server/index.js

@@ -2,7 +2,7 @@ const express = require('express');
 const compression = require('compression');
 const React = require('react');
 const ReactDOMServer = require('react-dom/server');
-const { renderStatic } = require('@uifabric/merge-styles/lib-commonjs/server');
+const { renderStatic } = require('@fluentui/merge-styles/lib-commonjs/server');
 const { configureLoadStyles } = require('@microsoft/load-themed-styles');
 const { initializeIcons } = require('@fluentui/font-icons-mdl2');
 

apps/theming-designer/package.json

@@ -22,7 +22,7 @@
   },
   "dependencies": {
     "@fluentui/react": "^7.142.0",
-    "@uifabric/merge-styles": "^7.19.1",
+    "@fluentui/merge-styles": "^7.19.1",
     "@fluentui/react-docsite-components": "^7.15.18",
     "@fluentui/foundation-legacy": "^7.9.9",
     "@fluentui/scheme-utilities": "^7.2.21",

apps/theming-designer/src/components/FabricPalette.tsx

@@ -1,7 +1,7 @@
 import * as React from 'react';
 import { FabricSlots, IThemeRules } from '@fluentui/react/lib/ThemeGenerator';
 import { MainPanelInnerContent } from '../shared/MainPanelStyles';
-import { mergeStyles } from '@uifabric/merge-styles';
+import { mergeStyles } from '@fluentui/merge-styles';
 import { Text } from '@fluentui/react';
 import { IColor } from '@fluentui/react/lib/Color';
 import { FabricSlotWidget } from './FabricSlotWidget';

apps/theming-designer/src/components/FabricSlotWidget.tsx

@@ -2,7 +2,7 @@ import * as React from 'react';
 import { IThemeRules, FabricSlots, IThemeSlotRule } from '@fluentui/react/lib/ThemeGenerator';
 import { IColor } from '@fluentui/react/lib/Color';
 import { Stack, IStackStyles } from '@fluentui/react/lib/Stack';
-import { mergeStyles } from '@uifabric/merge-styles';
+import { mergeStyles } from '@fluentui/merge-styles';
 import { ColorPicker } from '@fluentui/react/lib/ColorPicker';
 import { Callout, DirectionalHint } from '@fluentui/react/lib/Callout';
 

apps/theming-designer/src/components/Header.tsx

@@ -4,7 +4,7 @@ import { PrimaryButton } from '@fluentui/react/lib/compat/Button';
 import { Panel, PanelType } from '@fluentui/react/lib/Panel';
 import { Pivot, PivotItem } from '@fluentui/react/lib/Pivot';
 import { IThemeRules, ThemeGenerator } from '@fluentui/react/lib/ThemeGenerator';
-import { mergeStyles } from '@uifabric/merge-styles';
+import { mergeStyles } from '@fluentui/merge-styles';
 import { CodepenComponent } from '@fluentui/react-docsite-components';
 
 export interface IHeaderProps {

apps/theming-designer/src/components/Samples/index.tsx

@@ -7,7 +7,7 @@ import { Dropdown } from '@fluentui/react/lib/Dropdown';
 import { Icon } from '@fluentui/react/lib/Icon';
 import { Link } from '@fluentui/react/lib/Link';
 import { MainPanelInnerContent, MainPanelNumericalWidth } from '../../shared/MainPanelStyles';
-import { mergeStyles } from '@uifabric/merge-styles/lib/mergeStyles';
+import { mergeStyles } from '@fluentui/merge-styles/lib/mergeStyles';
 import { Persona, PersonaPresence } from '@fluentui/react/lib/Persona';
 import { Pivot, PivotItem } from '@fluentui/react/lib/Pivot';
 import { Slider } from '@fluentui/react/lib/Slider';

apps/theming-designer/src/components/SemanticSlots.tsx

@@ -1,7 +1,7 @@
 import * as React from 'react';
 import { ITheme, IPalette, ISemanticColors } from '@fluentui/react/lib/Styling';
 import { Stack } from '@fluentui/react';
-import { mergeStyles } from '@uifabric/merge-styles';
+import { mergeStyles } from '@fluentui/merge-styles';
 import { SemanticSlotsDetailsList } from './SemanticSlotsDetailsList';
 import { MainPanelInnerContent } from '../shared/MainPanelStyles';
 import { getVariant, VariantThemeType } from '@fluentui/scheme-utilities';

apps/theming-designer/src/components/ThemeDesignerColorPicker.tsx

@@ -4,7 +4,7 @@ import { TextField } from '@fluentui/react/lib/TextField';
 import { Stack } from '@fluentui/react/lib/Stack';
 import { ColorPicker } from '@fluentui/react/lib/ColorPicker';
 import { Callout } from '@fluentui/react/lib/Callout';
-import { mergeStyles } from '@uifabric/merge-styles';
+import { mergeStyles } from '@fluentui/merge-styles';
 import { IColor, getColorFromString } from '@fluentui/react/lib/Color';
 
 const colorLabelClassName = mergeStyles({

apps/theming-designer/src/components/ThemingDesigner.tsx

@@ -14,7 +14,7 @@ import { getColorFromString, IColor } from '@fluentui/react/lib/Color';
 import { Header } from './Header';
 import { IconButton } from '@fluentui/react/lib/compat/Button';
 import { isDark } from '@fluentui/react/lib/Color';
-import { mergeStyles } from '@uifabric/merge-styles';
+import { mergeStyles } from '@fluentui/merge-styles';
 import { Samples } from './Samples/index';
 import { Stack, IStackProps } from '@fluentui/react/lib/Stack';
 import { ThemeDesignerColorPicker } from './ThemeDesignerColorPicker';

apps/theming-designer/src/shared/MainPanelStyles.tsx

@@ -1,4 +1,4 @@
-import { mergeStyles } from '@uifabric/merge-styles';
+import { mergeStyles } from '@fluentui/merge-styles';
 
 export const MainPanelNumericalWidth = 1100;
 export const MainPanelWidth = `${MainPanelNumericalWidth}px`;

change/@fluentui-foundation-legacy-2020-10-20-17-22-49-merge-styles-rename.json

@@ -0,0 +1,8 @@
+{
+  "type": "patch",
+  "comment": "Rename @uifabric/merge-styles to @fluentui/merge-styles",
+  "packageName": "@fluentui/foundation-legacy",
+  "email": "ololubek@microsoft.com",
+  "dependentChangeType": "patch",
+  "date": "2020-10-21T00:22:30.127Z"
+}

change/@fluentui-merge-styles-2020-10-20-17-22-49-merge-styles-rename.json

@@ -0,0 +1,8 @@
+{
+  "type": "patch",
+  "comment": "Rename @uifabric/merge-styles to @fluentui/merge-styles",
+  "packageName": "@fluentui/merge-styles",
+  "email": "ololubek@microsoft.com",
+  "dependentChangeType": "patch",
+  "date": "2020-10-21T00:22:33.846Z"
+}

change/@fluentui-react-experiments-2020-10-20-17-22-49-merge-styles-rename.json

@@ -0,0 +1,8 @@
+{
+  "type": "patch",
+  "comment": "Rename @uifabric/merge-styles to @fluentui/merge-styles",
+  "packageName": "@fluentui/react-experiments",
+  "email": "ololubek@microsoft.com",
+  "dependentChangeType": "patch",
+  "date": "2020-10-21T00:22:35.070Z"
+}

change/@fluentui-react-focus-2020-10-20-17-22-49-merge-styles-rename.json

@@ -0,0 +1,8 @@
+{
+  "type": "patch",
+  "comment": "Rename @uifabric/merge-styles to @fluentui/merge-styles",
+  "packageName": "@fluentui/react-focus",
+  "email": "ololubek@microsoft.com",
+  "dependentChangeType": "patch",
+  "date": "2020-10-21T00:22:36.841Z"
+}

change/@fluentui-react-internal-2020-10-20-17-22-49-merge-styles-rename.json

@@ -0,0 +1,8 @@
+{
+  "type": "patch",
+  "comment": "Rename @uifabric/merge-styles to @fluentui/merge-styles",
+  "packageName": "@fluentui/react-internal",
+  "email": "ololubek@microsoft.com",
+  "dependentChangeType": "patch",
+  "date": "2020-10-21T00:22:38.481Z"
+}

change/@fluentui-react-monaco-editor-2020-10-20-17-22-49-merge-styles-rename.json

@@ -0,0 +1,8 @@
+{
+  "type": "patch",
+  "comment": "Rename @uifabric/merge-styles to @fluentui/merge-styles",
+  "packageName": "@fluentui/react-monaco-editor",
+  "email": "ololubek@microsoft.com",
+  "dependentChangeType": "patch",
+  "date": "2020-10-21T00:22:40.211Z"
+}

change/@fluentui-react-theme-provider-2020-10-20-17-22-49-merge-styles-rename.json

@@ -0,0 +1,8 @@
+{
+  "type": "patch",
+  "comment": "Rename @uifabric/merge-styles to @fluentui/merge-styles",
+  "packageName": "@fluentui/react-theme-provider",
+  "email": "ololubek@microsoft.com",
+  "dependentChangeType": "patch",
+  "date": "2020-10-21T00:22:43.612Z"
+}

change/@fluentui-style-utilities-2020-10-20-17-22-49-merge-styles-rename.json

@@ -0,0 +1,8 @@
+{
+  "type": "patch",
+  "comment": "Rename @uifabric/merge-styles to @fluentui/merge-styles",
+  "packageName": "@fluentui/style-utilities",
+  "email": "ololubek@microsoft.com",
+  "dependentChangeType": "patch",
+  "date": "2020-10-21T00:22:45.391Z"
+}

change/@fluentui-theme-2020-10-20-17-22-49-merge-styles-rename.json

@@ -0,0 +1,8 @@
+{
+  "type": "patch",
+  "comment": "Rename @uifabric/merge-styles to @fluentui/merge-styles",
+  "packageName": "@fluentui/theme",
+  "email": "ololubek@microsoft.com",
+  "dependentChangeType": "patch",
+  "date": "2020-10-21T00:22:47.191Z"
+}

change/@uifabric-jest-serializer-merge-styles-2020-10-20-17-22-49-merge-styles-rename.json

@@ -0,0 +1,8 @@
+{
+  "type": "patch",
+  "comment": "Rename @uifabric/merge-styles to @fluentui/merge-styles",
+  "packageName": "@uifabric/jest-serializer-merge-styles",
+  "email": "ololubek@microsoft.com",
+  "dependentChangeType": "patch",
+  "date": "2020-10-21T00:22:31.819Z"
+}

change/@uifabric-merge-styles-2020-10-15-02-05-19-dep-fixes.json

@@ -1,7 +1,7 @@
 {
   "type": "none",
   "comment": "Update npmignore",
-  "packageName": "@uifabric/merge-styles",
+  "packageName": "@fluentui/merge-styles",
   "email": "elcraig@microsoft.com",
   "dependentChangeType": "none",
   "date": "2020-10-15T09:00:08.940Z"

change/@uifabric-utilities-2020-10-20-17-22-49-merge-styles-rename.json

@@ -0,0 +1,8 @@
+{
+  "type": "patch",
+  "comment": "Rename @uifabric/merge-styles to @fluentui/merge-styles",
+  "packageName": "@uifabric/utilities",
+  "email": "ololubek@microsoft.com",
+  "dependentChangeType": "patch",
+  "date": "2020-10-21T00:22:49.079Z"
+}

packages/api-docs/package.json

@@ -38,7 +38,7 @@
     "@fluentui/react-toggle": "^0.4.4",
     "@fluentui/theme": "^1.2.1",
     "@uifabric/date-time": "^7.17.16",
-    "@uifabric/merge-styles": "^7.19.1",
+    "@fluentui/merge-styles": "^7.19.1",
     "@fluentui/react-cards": "^0.113.3",
     "@fluentui/style-utilities": "^7.16.9",
     "@uifabric/utilities": "^7.32.3",

packages/fluentui/docs/tsconfig.json

@@ -8,7 +8,7 @@
       "@fluentui/dom-utilities": ["packages/dom-utilities/src"],
       "@fluentui/keyboard-key": ["packages/keyboard-key/src/index"],
       "@fluentui/react-compose": ["packages/react-compose/src/index"],
-      "@uifabric/merge-styles": ["packages/merge-styles/src"],
+      "@fluentui/merge-styles": ["packages/merge-styles/src"],
       "@fluentui/set-version": ["packages/set-version/src"],
       "@uifabric/utilities": ["packages/utilities/src"],
       "@fluentui/date-time-utilities": ["packages/date-time-utilities/src"],

packages/foundation-legacy/package.json

@@ -45,7 +45,7 @@
     "react-test-renderer": "^16.3.0"
   },
   "dependencies": {
-    "@uifabric/merge-styles": "^7.19.1",
+    "@fluentui/merge-styles": "^7.19.1",
     "@fluentui/set-version": "^7.0.23",
     "@fluentui/style-utilities": "^7.16.9",
     "@uifabric/utilities": "^7.32.3",

packages/foundation-legacy/src/next/composed.tsx

@@ -1,5 +1,5 @@
 import * as React from 'react';
-import { mergeStyles } from '@uifabric/merge-styles';
+import { mergeStyles } from '@fluentui/merge-styles';
 import { concatStyleSets, IStyleSet, ITheme } from '@fluentui/style-utilities';
 import { Customizations, CustomizerContext, ICustomizerContext } from '@uifabric/utilities';
 import { createFactory, getSlots } from '../slots';

packages/foundation-legacy/src/slots.tsx

@@ -1,5 +1,5 @@
 import * as React from 'react';
-import { mergeCss } from '@uifabric/merge-styles';
+import { mergeCss } from '@fluentui/merge-styles';
 import { IStyle, ITheme } from '@fluentui/style-utilities';
 import { getRTL, memoizeFunction } from '@uifabric/utilities';
 import { assign } from './utilities';

packages/jest-serializer-merge-styles/README.md

@@ -1,10 +1,10 @@
 # @uifabric/jest-serializer-merge-styles
 
-Provides a Jest serializer for `@uifabric/merge-styles` which expands class names into css rules.
+Provides a Jest serializer for `@fluentui/merge-styles` which expands class names into css rules.
 
 ## Overview
 
-When using Jest snapshot testing with components that use `@uifabric/merge-styles`, class names may be rendered as such in the snapshot (Note the `css-2342` generated class name):
+When using Jest snapshot testing with components that use `@fluentui/merge-styles`, class names may be rendered as such in the snapshot (Note the `css-2342` generated class name):
 
 ```
 <div className='ms-Foo css-2432'>

packages/jest-serializer-merge-styles/package.json

@@ -37,6 +37,6 @@
   },
   "dependencies": {
     "@fluentui/set-version": "^7.0.23",
-    "@uifabric/merge-styles": "^7.19.1"
+    "@fluentui/merge-styles": "^7.19.1"
   }
 }

packages/jest-serializer-merge-styles/src/index.test.tsx

@@ -1,7 +1,7 @@
 import * as React from 'react';
 import * as renderer from 'react-test-renderer';
 import { print, test } from './index';
-import { Stylesheet, InjectionMode, mergeStyles, keyframes } from '@uifabric/merge-styles';
+import { Stylesheet, InjectionMode, mergeStyles, keyframes } from '@fluentui/merge-styles';
 
 const indent = (val: string): string => '    ' + val;
 

packages/jest-serializer-merge-styles/src/index.ts

@@ -1,4 +1,4 @@
-import { Stylesheet } from '@uifabric/merge-styles';
+import { Stylesheet } from '@fluentui/merge-styles';
 import './version';
 
 /**

packages/merge-styles/README.md

@@ -1,4 +1,4 @@
-# @uifabric/merge-styles
+# @fluentui/merge-styles
 
 The `merge-styles` library provides utilities for loading styles through javascript. It is designed to make it simple to style components through javascript. It generates css classes, rather than using inline styling, to ensure we can use css features like pseudo selectors (:hover) and parent/child selectors (media queries).
 
@@ -7,7 +7,7 @@ The library was built for speed and size; the entire package is 2.62k gzipped. I
 Simple usage:
 
 ```
-import { mergeStyles, mergeStyleSets } from '@uifabric/merge-styles';
+import { mergeStyles, mergeStyleSets } from '@fluentui/merge-styles';
 
 // Produces 'css-0' class name which can be used anywhere
 mergeStyles({ background: 'red' });
@@ -113,7 +113,7 @@ When building a component, you will need a **style set** map of class names to i
 The recommended pattern is to provide the classnames in a separate function, typically in a separate file `ComponentName.classNames.ts`.
 
 ```tsx
-import { IStyle, mergeStyleSets } from '@uifabric/merge-styles';
+import { IStyle, mergeStyleSets } from '@fluentui/merge-styles';
 
 export interface IComponentClassNames {
   root: string;
@@ -403,7 +403,7 @@ export const getClassNames = memoizeFunction((isToggled: boolean) => {
 Registering font faces example:
 
 ```tsx
-import { fontFace } from '@uifabric/merge-styles';
+import { fontFace } from '@fluentui/merge-styles';
 
 fontFace({
   fontFamily: `"Segoe UI"`,
@@ -419,7 +419,7 @@ Note that in cases like `fontFamily` you may need to embed quotes in the string
 Registering animation keyframes example:
 
 ```tsx
-import { keyframes, mergeStyleSets } from '@uifabric/merge-styles';
+import { keyframes, mergeStyleSets } from '@fluentui/merge-styles';
 
 let fadeIn = keyframes({
   from: {
@@ -460,7 +460,7 @@ You can import `renderStatic` method from the `/lib/server` entry to render cont
 Example:
 
 ```tsx
-import { renderStatic } from '@uifabric/merge-styles/lib/server';
+import { renderStatic } from '@fluentui/merge-styles/lib/server';
 
 let { html, css } = renderStatic(() => {
   return ReactDOM.renderToString(...);

packages/merge-styles/etc/merge-styles.api.md

@@ -1,4 +1,4 @@
-## API Report File for "@uifabric/merge-styles"
+## API Report File for "@fluentui/merge-styles"
 
 > Do not edit this file. It is a report generated by [API Extractor](https://api-extractor.com/).
 

packages/merge-styles/package.json

@@ -1,5 +1,5 @@
 {
-  "name": "@uifabric/merge-styles",
+  "name": "@fluentui/merge-styles",
   "version": "7.19.1",
   "description": "Style loading utilities.",
   "main": "lib-commonjs/index.js",

packages/merge-styles/src/version.ts

@@ -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 '@fluentui/set-version';
-setVersion('@uifabric/merge-styles', '0.0.0');
+setVersion('@fluentui/merge-styles', '0.0.0');

packages/react-examples/package.json

@@ -74,7 +74,7 @@
     "@fluentui/file-type-icons": "^7.6.9",
     "@fluentui/foundation-legacy": "^7.9.9",
     "@fluentui/font-icons-mdl2": "^7.5.8",
-    "@uifabric/merge-styles": "^7.19.1",
+    "@fluentui/merge-styles": "^7.19.1",
     "@fluentui/react-cards": "^0.113.3",
     "@uifabric/react-hooks": "^7.13.5",
     "@fluentui/style-utilities": "^7.16.9",

packages/react-examples/src/react-experiments/SelectedPeopleList/SelectedPeopleList.Basic.DragDrop.Example.tsx

@@ -6,7 +6,7 @@ import { people } from '@fluentui/example-data';
 import { SelectedPeopleList } from '@fluentui/react-experiments/lib/SelectedItemsList';
 import { DragDropHelper } from '@fluentui/react/lib/DragDrop';
 import { getTheme } from '@fluentui/react/lib/Styling';
-import { mergeStyles } from '@uifabric/merge-styles';
+import { mergeStyles } from '@fluentui/merge-styles';
 import { IDragDropEvents, Selection } from '@fluentui/react';
 
 export const SelectedPeopleListBasicDragDropExample = <T extends {}>(): JSX.Element => {

packages/react-examples/src/react-experiments/SelectedPeopleList/SelectedPeopleList.DragDropBetweenWells.Example.tsx

@@ -6,7 +6,7 @@ import { people } from '@fluentui/example-data';
 import { SelectedPeopleList } from '@fluentui/react-experiments/lib/SelectedItemsList';
 import { DragDropHelper } from '@fluentui/react/lib/DragDrop';
 import { getTheme } from '@fluentui/react/lib/Styling';
-import { mergeStyles } from '@uifabric/merge-styles';
+import { mergeStyles } from '@fluentui/merge-styles';
 import { IDragDropEvents, Selection } from '@fluentui/react';
 
 const SelectedPeopleListBasicDragDropExample = <T extends {}>(): JSX.Element => {

packages/react-experiments/package.json

@@ -59,7 +59,7 @@
     "@fluentui/example-data": "^7.1.5",
     "@fluentui/foundation-legacy": "^7.9.9",
     "@fluentui/font-icons-mdl2": "^7.5.8",
-    "@uifabric/merge-styles": "^7.19.1",
+    "@fluentui/merge-styles": "^7.19.1",
     "@uifabric/react-hooks": "^7.13.5",
     "@fluentui/set-version": "^7.0.23",
     "@fluentui/style-utilities": "^7.16.9",

packages/react-experiments/src/components/Button/Button.types.tsx

@@ -1,7 +1,7 @@
 import * as React from 'react';
 // Temporary import file to experiment with next version of foundation.
 import { IComponent } from '@fluentui/foundation-legacy/lib/next/IComponent';
-import { IRawFontStyle, IRawStyleBase } from '@uifabric/merge-styles/lib/IRawStyleBase';
+import { IRawFontStyle, IRawStyleBase } from '@fluentui/merge-styles/lib/IRawStyleBase';
 import { ITextSlot } from '@fluentui/react';
 import { IComponentStyles, ISlottableProps, ISlotProp, IStyleableComponentProps } from '@fluentui/foundation-legacy';
 import { IFontIconSlot } from '../../utilities/factoryComponents.types';