From 820f901faf4edc1366c3558eab8db7f5c406ebfd Mon Sep 17 00:00:00 2001 From: Juraj Kapsiar Date: Wed, 10 Jan 2024 08:51:03 +0100 Subject: [PATCH 1/3] Remove v0 dependency from v0 compat package --- .../react-components/react-migration-v0-v9/package.json | 2 +- .../src/components/Button/ButtonMigration.mixins.ts | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/packages/react-components/react-migration-v0-v9/package.json b/packages/react-components/react-migration-v0-v9/package.json index c6863c558ec79..fc4839241b0d1 100644 --- a/packages/react-components/react-migration-v0-v9/package.json +++ b/packages/react-components/react-migration-v0-v9/package.json @@ -27,6 +27,7 @@ "@fluentui/eslint-plugin": "*", "@fluentui/react-conformance": "*", "@fluentui/react-conformance-griffel": "*", + "@fluentui/react-northstar": "^0.66.4", "@fluentui/scripts-api-extractor": "*", "@fluentui/scripts-tasks": "*", "@fluentui/scripts-storybook": "*" @@ -37,7 +38,6 @@ "@fluentui/react-context-selector": "^9.1.46", "@fluentui/react-icons": "^2.0.224", "@fluentui/react-jsx-runtime": "^9.0.24", - "@fluentui/react-northstar": "^0.66.4", "@fluentui/react-shared-contexts": "^9.13.2", "@fluentui/react-tabster": "^9.17.0", "@fluentui/react-theme": "^9.1.16", diff --git a/packages/react-components/react-migration-v0-v9/src/components/Button/ButtonMigration.mixins.ts b/packages/react-components/react-migration-v0-v9/src/components/Button/ButtonMigration.mixins.ts index b920d69055b96..ef7e47393253a 100644 --- a/packages/react-components/react-migration-v0-v9/src/components/Button/ButtonMigration.mixins.ts +++ b/packages/react-components/react-migration-v0-v9/src/components/Button/ButtonMigration.mixins.ts @@ -1,7 +1,11 @@ import { GriffelStyle, shorthands } from '@fluentui/react-components'; -import { iconClassNames } from '@fluentui/react-northstar'; import { iconFilledClassName, iconRegularClassName } from '@fluentui/react-icons'; +const iconClassNames = { + filled: 'ui-icon__filled', + outline: 'ui-icon__outline', +}; + export const v9HoverClasses = (): GriffelStyle => ({ [`& .${iconFilledClassName}`]: { display: 'none', From fc2b83f4d7bbf34e064674a72acb04d51b0f9067 Mon Sep 17 00:00:00 2001 From: Juraj Kapsiar Date: Wed, 10 Jan 2024 08:16:25 +0000 Subject: [PATCH 2/3] change --- ...gration-v0-v9-f1f7af36-9864-40cc-8dad-6ad1306da991.json | 7 +++++++ .../src/components/Button/ButtonMigration.mixins.ts | 1 + 2 files changed, 8 insertions(+) create mode 100644 change/@fluentui-react-migration-v0-v9-f1f7af36-9864-40cc-8dad-6ad1306da991.json diff --git a/change/@fluentui-react-migration-v0-v9-f1f7af36-9864-40cc-8dad-6ad1306da991.json b/change/@fluentui-react-migration-v0-v9-f1f7af36-9864-40cc-8dad-6ad1306da991.json new file mode 100644 index 0000000000000..0465c310dee76 --- /dev/null +++ b/change/@fluentui-react-migration-v0-v9-f1f7af36-9864-40cc-8dad-6ad1306da991.json @@ -0,0 +1,7 @@ +{ + "type": "patch", + "comment": "Remove dependency on v0", + "packageName": "@fluentui/react-migration-v0-v9", + "email": "jurokapsiar@gmail.com", + "dependentChangeType": "patch" +} diff --git a/packages/react-components/react-migration-v0-v9/src/components/Button/ButtonMigration.mixins.ts b/packages/react-components/react-migration-v0-v9/src/components/Button/ButtonMigration.mixins.ts index ef7e47393253a..75b6acdf9151b 100644 --- a/packages/react-components/react-migration-v0-v9/src/components/Button/ButtonMigration.mixins.ts +++ b/packages/react-components/react-migration-v0-v9/src/components/Button/ButtonMigration.mixins.ts @@ -1,6 +1,7 @@ import { GriffelStyle, shorthands } from '@fluentui/react-components'; import { iconFilledClassName, iconRegularClassName } from '@fluentui/react-icons'; +// class names from v0 - not imported as we do not want to keep depending on v0. const iconClassNames = { filled: 'ui-icon__filled', outline: 'ui-icon__outline', From 93bf21794beaf4e8bbd5e5cba039770c86edf9d1 Mon Sep 17 00:00:00 2001 From: Juraj Kapsiar Date: Wed, 10 Jan 2024 08:34:53 +0000 Subject: [PATCH 3/3] fix deps --- packages/react-components/react-migration-v0-v9/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/react-components/react-migration-v0-v9/package.json b/packages/react-components/react-migration-v0-v9/package.json index fc4839241b0d1..6aa2777b34d9a 100644 --- a/packages/react-components/react-migration-v0-v9/package.json +++ b/packages/react-components/react-migration-v0-v9/package.json @@ -27,7 +27,7 @@ "@fluentui/eslint-plugin": "*", "@fluentui/react-conformance": "*", "@fluentui/react-conformance-griffel": "*", - "@fluentui/react-northstar": "^0.66.4", + "@fluentui/react-northstar": "*", "@fluentui/scripts-api-extractor": "*", "@fluentui/scripts-tasks": "*", "@fluentui/scripts-storybook": "*"