From 37e5ae9c33d6fc2793cfbd40f853542068ad25cf Mon Sep 17 00:00:00 2001 From: Chris Holt Date: Fri, 14 Apr 2023 12:28:23 -0700 Subject: [PATCH 1/3] update FAST dependencies to mitigate Safari 16.4 AdoptedStyleSheets bug --- packages/web-components/package.json | 4 ++-- yarn.lock | 15 ++++++++++----- 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/packages/web-components/package.json b/packages/web-components/package.json index d8df95c172ee07..8107b4bf056193 100644 --- a/packages/web-components/package.json +++ b/packages/web-components/package.json @@ -73,8 +73,8 @@ }, "dependencies": { "@microsoft/fast-colors": "^5.3.0", - "@microsoft/fast-element": "^1.11.0", - "@microsoft/fast-foundation": "^2.48.0", + "@microsoft/fast-element": "^1.11.1", + "@microsoft/fast-foundation": "^2.48.1", "@microsoft/fast-web-utilities": "^5.4.0", "tslib": "^2.1.0" } diff --git a/yarn.lock b/yarn.lock index 72bfbb1938745e..1aa6da995e2541 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3054,12 +3054,17 @@ resolved "https://registry.yarnpkg.com/@microsoft/fast-element/-/fast-element-1.11.0.tgz#494f6c87057bcbb42406982d68a92887d6b5acb1" integrity sha512-VKJYMkS5zgzHHb66sY7AFpYv6IfFhXrjQcAyNgi2ivD65My1XOhtjfKez5ELcLFRJfgZNAxvI8kE69apXERTkw== -"@microsoft/fast-foundation@^2.48.0": - version "2.48.0" - resolved "https://registry.yarnpkg.com/@microsoft/fast-foundation/-/fast-foundation-2.48.0.tgz#d0fcc333a1ed65a4f2d69d97247367600a35baca" - integrity sha512-kKrMq6oi16/BEL9UhjaZZcQ65BFYXBnIyzqkPlaG7AQ6afmQr33Azhfvx1yio77NjkWdpIUDhYrG/1qRz+VZKw== +"@microsoft/fast-element@^1.11.1": + version "1.11.1" + resolved "https://registry.yarnpkg.com/@microsoft/fast-element/-/fast-element-1.11.1.tgz#97a43dfaf0e2debcad3e5bfba36edb6572ac01ca" + integrity sha512-qBGQ94V4ktMMXmxNdgF78TPNImv2ctXUi3Vzj3j2X71gpUcr+Fkat7mLcTNC3y/Jc4W63fAhK2vP3MkwYRS5kQ== + +"@microsoft/fast-foundation@^2.48.1": + version "2.48.1" + resolved "https://registry.yarnpkg.com/@microsoft/fast-foundation/-/fast-foundation-2.48.1.tgz#3dbd7587a1462938e836ae350788176f886d88b8" + integrity sha512-gJR/26hhJipsZ4JD5DSOODb3GFYf7vgCnxS2ag4dj+Mi8ytkAwMPglTOv7v0zsJC2CHqOjY8Ixs66dhepgNkeQ== dependencies: - "@microsoft/fast-element" "^1.11.0" + "@microsoft/fast-element" "^1.11.1" "@microsoft/fast-web-utilities" "^5.4.1" tabbable "^5.2.0" tslib "^1.13.0" From 47c261930881e9be851f28af50c0ad0b3403a6ad Mon Sep 17 00:00:00 2001 From: Chris Holt Date: Fri, 14 Apr 2023 12:38:59 -0700 Subject: [PATCH 2/3] change files --- ...eb-components-6a017afa-1d29-4967-9507-7113fd37dbb5.json | 7 +++++++ yarn.lock | 7 +------ 2 files changed, 8 insertions(+), 6 deletions(-) create mode 100644 change/@fluentui-web-components-6a017afa-1d29-4967-9507-7113fd37dbb5.json diff --git a/change/@fluentui-web-components-6a017afa-1d29-4967-9507-7113fd37dbb5.json b/change/@fluentui-web-components-6a017afa-1d29-4967-9507-7113fd37dbb5.json new file mode 100644 index 00000000000000..0d0ae5740e13b6 --- /dev/null +++ b/change/@fluentui-web-components-6a017afa-1d29-4967-9507-7113fd37dbb5.json @@ -0,0 +1,7 @@ +{ + "type": "patch", + "comment": "update FAST dependencies to mitigate Safari 16.4 AdoptedStyleSheets bug", + "packageName": "@fluentui/web-components", + "email": "chhol@microsoft.com", + "dependentChangeType": "patch" +} diff --git a/yarn.lock b/yarn.lock index 1aa6da995e2541..b9376f396b6b71 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3049,12 +3049,7 @@ resolved "https://registry.yarnpkg.com/@microsoft/fast-colors/-/fast-colors-5.3.1.tgz#defc59874176e42316be7e6d24c31885ead8ca56" integrity sha512-72RZXVfCbwQzvo5sXXkuLXLT7rMeYaSf5r/6ewQiv/trBtqpWRm4DEH2EilHw/iWTBKOXs1qZNQndgUMa5n4LA== -"@microsoft/fast-element@^1.11.0": - version "1.11.0" - resolved "https://registry.yarnpkg.com/@microsoft/fast-element/-/fast-element-1.11.0.tgz#494f6c87057bcbb42406982d68a92887d6b5acb1" - integrity sha512-VKJYMkS5zgzHHb66sY7AFpYv6IfFhXrjQcAyNgi2ivD65My1XOhtjfKez5ELcLFRJfgZNAxvI8kE69apXERTkw== - -"@microsoft/fast-element@^1.11.1": +"@microsoft/fast-element@^1.11.0", "@microsoft/fast-element@^1.11.1": version "1.11.1" resolved "https://registry.yarnpkg.com/@microsoft/fast-element/-/fast-element-1.11.1.tgz#97a43dfaf0e2debcad3e5bfba36edb6572ac01ca" integrity sha512-qBGQ94V4ktMMXmxNdgF78TPNImv2ctXUi3Vzj3j2X71gpUcr+Fkat7mLcTNC3y/Jc4W63fAhK2vP3MkwYRS5kQ== From 48bd3597324cf0c2d4b5f28b67161b91bde9a413 Mon Sep 17 00:00:00 2001 From: Chris Holt Date: Fri, 14 Apr 2023 13:28:15 -0700 Subject: [PATCH 3/3] dedupe deps --- apps/stress-test/package.json | 2 +- yarn.lock | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/stress-test/package.json b/apps/stress-test/package.json index 2e6b25397a42c1..9fa55c88beaf5f 100644 --- a/apps/stress-test/package.json +++ b/apps/stress-test/package.json @@ -14,7 +14,7 @@ "@fluentui/react-components": "^9.18.9", "@fluentui/react-icons": "^2.0.196", "@fluentui/web-components": "^2.5.13", - "@microsoft/fast-element": "^1.11.0", + "@microsoft/fast-element": "^1.11.1", "afterframe": "1.0.2", "react": "17.0.2", "react-dom": "17.0.2", diff --git a/yarn.lock b/yarn.lock index b9376f396b6b71..577175f92bf6f7 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3049,7 +3049,7 @@ resolved "https://registry.yarnpkg.com/@microsoft/fast-colors/-/fast-colors-5.3.1.tgz#defc59874176e42316be7e6d24c31885ead8ca56" integrity sha512-72RZXVfCbwQzvo5sXXkuLXLT7rMeYaSf5r/6ewQiv/trBtqpWRm4DEH2EilHw/iWTBKOXs1qZNQndgUMa5n4LA== -"@microsoft/fast-element@^1.11.0", "@microsoft/fast-element@^1.11.1": +"@microsoft/fast-element@^1.11.1": version "1.11.1" resolved "https://registry.yarnpkg.com/@microsoft/fast-element/-/fast-element-1.11.1.tgz#97a43dfaf0e2debcad3e5bfba36edb6572ac01ca" integrity sha512-qBGQ94V4ktMMXmxNdgF78TPNImv2ctXUi3Vzj3j2X71gpUcr+Fkat7mLcTNC3y/Jc4W63fAhK2vP3MkwYRS5kQ==