From e02b926b8f4cd072147f2d9b9c9b1a1d6ba3c367 Mon Sep 17 00:00:00 2001 From: Chris Holt Date: Tue, 14 Feb 2023 09:59:49 -0800 Subject: [PATCH 1/2] update fast element and foundation versions and update reference to extend badge options --- ...s-f31a00b9-ac73-4bbf-841d-f03863621252.json | 7 +++++++ packages/web-components/package.json | 4 ++-- .../web-components/src/badge/badge.options.ts | 5 ++--- yarn.lock | 18 +++++++++--------- 4 files changed, 20 insertions(+), 14 deletions(-) create mode 100644 change/@fluentui-web-components-f31a00b9-ac73-4bbf-841d-f03863621252.json diff --git a/change/@fluentui-web-components-f31a00b9-ac73-4bbf-841d-f03863621252.json b/change/@fluentui-web-components-f31a00b9-ac73-4bbf-841d-f03863621252.json new file mode 100644 index 00000000000000..ca3a1909572f49 --- /dev/null +++ b/change/@fluentui-web-components-f31a00b9-ac73-4bbf-841d-f03863621252.json @@ -0,0 +1,7 @@ +{ + "type": "prerelease", + "comment": "update fast element and foundation versions and update reference to extend badge options", + "packageName": "@fluentui/web-components", + "email": "chhol@microsoft.com", + "dependentChangeType": "patch" +} diff --git a/packages/web-components/package.json b/packages/web-components/package.json index 8c93c239671325..b3acb78c31b309 100644 --- a/packages/web-components/package.json +++ b/packages/web-components/package.json @@ -104,8 +104,8 @@ "typescript": "4.7.4" }, "dependencies": { - "@microsoft/fast-element": "^2.0.0-beta.20", - "@microsoft/fast-foundation": "^3.0.0-alpha.24", + "@microsoft/fast-element": "^2.0.0-beta.21", + "@microsoft/fast-foundation": "^3.0.0-alpha.25", "@microsoft/fast-web-utilities": "^6.0.0", "@fluentui/tokens": "1.0.0-alpha.2", "tslib": "^2.1.0" diff --git a/packages/web-components/src/badge/badge.options.ts b/packages/web-components/src/badge/badge.options.ts index 9fd2a6613ca89c..48d478b5ce4b94 100644 --- a/packages/web-components/src/badge/badge.options.ts +++ b/packages/web-components/src/badge/badge.options.ts @@ -1,10 +1,9 @@ -import { StartEndOptions, StaticallyComposableHTML, ValuesOf } from '@microsoft/fast-foundation'; -import type { Badge } from './badge.js'; +import { BadgeOptions, StaticallyComposableHTML, ValuesOf } from '@microsoft/fast-foundation'; /** * @internal - marking as internal update when Badge PR for start/end is in */ -export type BadgeOptions = StartEndOptions & { +export type BadgeOptions = BadgeOptions & { defaultContent?: StaticallyComposableHTML; }; diff --git a/yarn.lock b/yarn.lock index f2411aa80b81c1..4e304ac6350f4a 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3046,18 +3046,18 @@ resolved "https://registry.yarnpkg.com/@microsoft/fast-element/-/fast-element-1.11.0.tgz#494f6c87057bcbb42406982d68a92887d6b5acb1" integrity sha512-VKJYMkS5zgzHHb66sY7AFpYv6IfFhXrjQcAyNgi2ivD65My1XOhtjfKez5ELcLFRJfgZNAxvI8kE69apXERTkw== -"@microsoft/fast-element@^2.0.0-beta.20": - version "2.0.0-beta.20" - resolved "https://registry.yarnpkg.com/@microsoft/fast-element/-/fast-element-2.0.0-beta.20.tgz#a8b145386fc2442c3dc60f2495f54b12cab85ef5" - integrity sha512-7Ehsq1FzLUQA90rQH14Bx6C0UAtx/13Ihm+0M7zQk46vL/PVvP0t/supn5UnjtI9d/zDrM5jxaFcxYjTfW8aIA== +"@microsoft/fast-element@^2.0.0-beta.21": + version "2.0.0-beta.21" + resolved "https://registry.yarnpkg.com/@microsoft/fast-element/-/fast-element-2.0.0-beta.21.tgz#98710d92f84f3e7f204514c194cbcf3ef8a485a2" + integrity sha512-cyM7ieXW82JqgHK3Es9Gu8EvtZOjqd0adhceoibQsdU9OpJVqKbriNNGDC7+EuGkMrczo2AnIIhP3/mGQ85faQ== -"@microsoft/fast-foundation@^3.0.0-alpha.24": - version "3.0.0-alpha.24" - resolved "https://registry.yarnpkg.com/@microsoft/fast-foundation/-/fast-foundation-3.0.0-alpha.24.tgz#3b750f1fbee9f7f9ca771053c7c941ff2d69fb6c" - integrity sha512-Ln33vUNm5t//rK0UAF/GM6njJr36M/ure0NUwbifAPqYmV8l9FgnnI+IY7kWBFhn+kZLERBh5sSz2TWGgMF9lg== +"@microsoft/fast-foundation@^3.0.0-alpha.25": + version "3.0.0-alpha.25" + resolved "https://registry.yarnpkg.com/@microsoft/fast-foundation/-/fast-foundation-3.0.0-alpha.25.tgz#7098318b1e9c312085c5d7bd15dc4ce19c89f85a" + integrity sha512-W3MpIxJvF3x14yWWZFVi3BXIK9JbzksLgWaQxlEhHaSwYwUDb2yaWwXJby6ZOKZa2c7ns51rv4xGTPmvaGUwag== dependencies: "@floating-ui/dom" "^1.0.3" - "@microsoft/fast-element" "^2.0.0-beta.20" + "@microsoft/fast-element" "^2.0.0-beta.21" "@microsoft/fast-web-utilities" "^6.0.0" tabbable "^5.2.0" tslib "^2.4.0" From a9cf625154f0035a0cf575e60be2b0b78c7251cc Mon Sep 17 00:00:00 2001 From: Chris Holt Date: Tue, 14 Feb 2023 10:41:43 -0800 Subject: [PATCH 2/2] no options export yet for badge :( --- ...-web-components-f31a00b9-ac73-4bbf-841d-f03863621252.json | 2 +- packages/web-components/src/badge/badge.options.ts | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/change/@fluentui-web-components-f31a00b9-ac73-4bbf-841d-f03863621252.json b/change/@fluentui-web-components-f31a00b9-ac73-4bbf-841d-f03863621252.json index ca3a1909572f49..3194d5b3d52cc6 100644 --- a/change/@fluentui-web-components-f31a00b9-ac73-4bbf-841d-f03863621252.json +++ b/change/@fluentui-web-components-f31a00b9-ac73-4bbf-841d-f03863621252.json @@ -1,6 +1,6 @@ { "type": "prerelease", - "comment": "update fast element and foundation versions and update reference to extend badge options", + "comment": "update fast element and foundation versions", "packageName": "@fluentui/web-components", "email": "chhol@microsoft.com", "dependentChangeType": "patch" diff --git a/packages/web-components/src/badge/badge.options.ts b/packages/web-components/src/badge/badge.options.ts index 48d478b5ce4b94..9fd2a6613ca89c 100644 --- a/packages/web-components/src/badge/badge.options.ts +++ b/packages/web-components/src/badge/badge.options.ts @@ -1,9 +1,10 @@ -import { BadgeOptions, StaticallyComposableHTML, ValuesOf } from '@microsoft/fast-foundation'; +import { StartEndOptions, StaticallyComposableHTML, ValuesOf } from '@microsoft/fast-foundation'; +import type { Badge } from './badge.js'; /** * @internal - marking as internal update when Badge PR for start/end is in */ -export type BadgeOptions = BadgeOptions & { +export type BadgeOptions = StartEndOptions & { defaultContent?: StaticallyComposableHTML; };