From e869bccfd6a895a9dca82cbf9bdbebf3ebbef8a5 Mon Sep 17 00:00:00 2001 From: Martin Hochel Date: Thu, 15 Sep 2022 12:15:57 +0200 Subject: [PATCH 1/4] fix: update version mismatches triggered by v9 release --- packages/fluentui/react-northstar/package.json | 2 +- packages/react/package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/fluentui/react-northstar/package.json b/packages/fluentui/react-northstar/package.json index 9951c334586c3f..4076dc064c5369 100644 --- a/packages/fluentui/react-northstar/package.json +++ b/packages/fluentui/react-northstar/package.json @@ -14,7 +14,7 @@ "@fluentui/react-component-ref": "^0.64.0", "@fluentui/react-icons-northstar": "^0.64.0", "@fluentui/react-northstar-styles-renderer": "^0.64.0", - "@fluentui/react-portal-compat-context": "^9.0.1", + "@fluentui/react-portal-compat-context": "^9.0.2", "@fluentui/react-proptypes": "^0.64.0", "@fluentui/state": "^0.64.0", "@fluentui/styles": "^0.64.0", diff --git a/packages/react/package.json b/packages/react/package.json index 2a1274aa0659d0..097526a924a436 100644 --- a/packages/react/package.json +++ b/packages/react/package.json @@ -50,7 +50,7 @@ "@fluentui/merge-styles": "^8.5.3", "@fluentui/react-focus": "^8.8.5", "@fluentui/react-hooks": "^8.6.11", - "@fluentui/react-portal-compat-context": "^9.0.1", + "@fluentui/react-portal-compat-context": "^9.0.2", "@fluentui/react-window-provider": "^2.2.2", "@fluentui/set-version": "^8.2.2", "@fluentui/style-utilities": "^8.7.12", From 1f3a0511cec0b9f9dc6f2523c6f723e5ee52ccc4 Mon Sep 17 00:00:00 2001 From: Martin Hochel Date: Thu, 15 Sep 2022 12:16:39 +0200 Subject: [PATCH 2/4] generate change file --- ...luentui-react-97f81ce7-b9b5-4983-b1f8-454ffb453492.json | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 change/@fluentui-react-97f81ce7-b9b5-4983-b1f8-454ffb453492.json diff --git a/change/@fluentui-react-97f81ce7-b9b5-4983-b1f8-454ffb453492.json b/change/@fluentui-react-97f81ce7-b9b5-4983-b1f8-454ffb453492.json new file mode 100644 index 00000000000000..c3b822db97b138 --- /dev/null +++ b/change/@fluentui-react-97f81ce7-b9b5-4983-b1f8-454ffb453492.json @@ -0,0 +1,7 @@ +{ + "type": "patch", + "comment": "fix: update version mismatches triggered by v9 release", + "packageName": "@fluentui/react", + "email": "martinhochel@microsoft.com", + "dependentChangeType": "patch" +} From 9d6876dd6c260c04ce98f11bd1331750105ce137 Mon Sep 17 00:00:00 2001 From: Martin Hochel Date: Thu, 15 Sep 2022 12:35:43 +0200 Subject: [PATCH 3/4] chore: update yarn.lock --- yarn.lock | 53 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 53 insertions(+) diff --git a/yarn.lock b/yarn.lock index df23a510368cab..e4474eeb1b4c8b 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1705,6 +1705,20 @@ "@uifabric/set-version" "^7.0.23" tslib "^1.10.0" +"@fluentui/react-button@9.1.0": + version "9.1.0" + resolved "https://registry.yarnpkg.com/@fluentui/react-button/-/react-button-9.1.0.tgz#b65af2690b368c5de7233dc59ae4c8ae6ca7e9a7" + integrity sha512-zP69IxAS3MeQ8c185llrVl61Ixctup2cmwu9UdDYmCbQC7pn/clOWUFGfa1oM7n6NTYawcL58Q5//P/UlwUQqQ== + dependencies: + "@fluentui/keyboard-keys" "^9.0.0" + "@fluentui/react-aria" "^9.1.0" + "@fluentui/react-icons" "^2.0.175" + "@fluentui/react-tabster" "^9.1.0" + "@fluentui/react-theme" "^9.0.0" + "@fluentui/react-utilities" "^9.0.2" + "@griffel/react" "^1.2.3" + tslib "^2.1.0" + "@fluentui/react-icons@^2.0.175": version "2.0.175" resolved "https://registry.yarnpkg.com/@fluentui/react-icons/-/react-icons-2.0.175.tgz#70f60989b5792c1770253beeb0a1f4dc9329e59d" @@ -1713,6 +1727,26 @@ "@griffel/react" "^1.0.0" tslib "^2.1.0" +"@fluentui/react-provider@9.1.0": + version "9.1.0" + resolved "https://registry.yarnpkg.com/@fluentui/react-provider/-/react-provider-9.1.0.tgz#12cfd81540588bbc6063bd968e3656c17d5dfd23" + integrity sha512-XB1PWRk3d8QkPvrum8rCIjJnRyHjMxcrSnQMzhf0MMAKTnip2keRregXfEwudx/SEiYLrUB9R34lnOx5hl/y+A== + dependencies: + "@fluentui/react-shared-contexts" "^9.0.0" + "@fluentui/react-tabster" "^9.1.0" + "@fluentui/react-theme" "^9.0.0" + "@fluentui/react-utilities" "^9.0.2" + "@griffel/core" "^1.5.1" + "@griffel/react" "^1.2.3" + tslib "^2.1.0" + +"@fluentui/react-theme@9.0.0": + version "9.0.0" + resolved "https://registry.yarnpkg.com/@fluentui/react-theme/-/react-theme-9.0.0.tgz#ff1ea2bbe66286d1561f51a01a4ce3e2b377374e" + integrity sha512-/cmGk4Yax/5hdumylkccSAydmlsvuEs/Vu5IFFxpFui0Nq8WrhHvyCzErQksInVP0Arl/UnbQKFO21qcR48Y+w== + dependencies: + tslib "^2.1.0" + "@griffel/babel-preset@1.3.6", "@griffel/babel-preset@^1.3.6": version "1.3.6" resolved "https://registry.yarnpkg.com/@griffel/babel-preset/-/babel-preset-1.3.6.tgz#2e7ff042217b9a0d50b40c8e18c16e029d65146f" @@ -1739,6 +1773,17 @@ stylis "^4.0.13" tslib "^2.1.0" +"@griffel/core@^1.6.0": + version "1.6.0" + resolved "https://registry.yarnpkg.com/@griffel/core/-/core-1.6.0.tgz#947a88f3e56db8da18f4fc81aee40d2b7a6fd90d" + integrity sha512-mHISgmjUYDC2/tnIfl32fuFlme6QIW81XO+OtRrhy6uxCV6BrBZtMfzlpOt7W/UCac4oHYldnYbpbsP3uYUFNg== + dependencies: + "@emotion/hash" "^0.8.0" + csstype "^3.0.10" + rtl-css-js "^1.16.0" + stylis "^4.0.13" + tslib "^2.1.0" + "@griffel/eslint-plugin@1.0.0": version "1.0.0" resolved "https://registry.yarnpkg.com/@griffel/eslint-plugin/-/eslint-plugin-1.0.0.tgz#cba251b7a140399c6686b72a72e9fa2ee481f532" @@ -1770,6 +1815,14 @@ "@griffel/core" "^1.5.1" tslib "^2.1.0" +"@griffel/react@^1.2.3": + version "1.3.1" + resolved "https://registry.yarnpkg.com/@griffel/react/-/react-1.3.1.tgz#6602aac57ea5aaebae8ea10c31dfb6f0dbb70248" + integrity sha512-R6dqoNFvn8ceaJ3HXvMelmGU23wJfZ9p1xmNnGgJmPENg8YFI0rKBBymU2D4z1ekqnRbUb9qNglCkSQ4AyL/wQ== + dependencies: + "@griffel/core" "^1.6.0" + tslib "^2.1.0" + "@griffel/webpack-extraction-plugin@0.1.4": version "0.1.4" resolved "https://registry.yarnpkg.com/@griffel/webpack-extraction-plugin/-/webpack-extraction-plugin-0.1.4.tgz#2410505aff385e93062c017a3b5f1e7167b2beb3" From 8a0ce65edb9b790b115c4a3d8d8a827fbb242d66 Mon Sep 17 00:00:00 2001 From: Martin Hochel Date: Thu, 15 Sep 2022 12:42:29 +0200 Subject: [PATCH 4/4] fix(react-18-tests-v9): use caret versions for internal packages --- apps/react-18-tests-v9/package.json | 6 ++-- yarn.lock | 53 ----------------------------- 2 files changed, 3 insertions(+), 56 deletions(-) diff --git a/apps/react-18-tests-v9/package.json b/apps/react-18-tests-v9/package.json index cb22bede8c9bbe..4d77ba2b83f1fb 100644 --- a/apps/react-18-tests-v9/package.json +++ b/apps/react-18-tests-v9/package.json @@ -21,9 +21,9 @@ "swc-loader": "^0.2.3" }, "dependencies": { - "@fluentui/react-button": "9.1.0", - "@fluentui/react-provider": "9.1.0", - "@fluentui/react-theme": "9.0.0", + "@fluentui/react-button": "^9.1.1", + "@fluentui/react-provider": "^9.1.1", + "@fluentui/react-theme": "^9.1.0", "react": "18.2.0", "react-dom": "18.2.0", "tslib": "^2.1.0" diff --git a/yarn.lock b/yarn.lock index e4474eeb1b4c8b..df23a510368cab 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1705,20 +1705,6 @@ "@uifabric/set-version" "^7.0.23" tslib "^1.10.0" -"@fluentui/react-button@9.1.0": - version "9.1.0" - resolved "https://registry.yarnpkg.com/@fluentui/react-button/-/react-button-9.1.0.tgz#b65af2690b368c5de7233dc59ae4c8ae6ca7e9a7" - integrity sha512-zP69IxAS3MeQ8c185llrVl61Ixctup2cmwu9UdDYmCbQC7pn/clOWUFGfa1oM7n6NTYawcL58Q5//P/UlwUQqQ== - dependencies: - "@fluentui/keyboard-keys" "^9.0.0" - "@fluentui/react-aria" "^9.1.0" - "@fluentui/react-icons" "^2.0.175" - "@fluentui/react-tabster" "^9.1.0" - "@fluentui/react-theme" "^9.0.0" - "@fluentui/react-utilities" "^9.0.2" - "@griffel/react" "^1.2.3" - tslib "^2.1.0" - "@fluentui/react-icons@^2.0.175": version "2.0.175" resolved "https://registry.yarnpkg.com/@fluentui/react-icons/-/react-icons-2.0.175.tgz#70f60989b5792c1770253beeb0a1f4dc9329e59d" @@ -1727,26 +1713,6 @@ "@griffel/react" "^1.0.0" tslib "^2.1.0" -"@fluentui/react-provider@9.1.0": - version "9.1.0" - resolved "https://registry.yarnpkg.com/@fluentui/react-provider/-/react-provider-9.1.0.tgz#12cfd81540588bbc6063bd968e3656c17d5dfd23" - integrity sha512-XB1PWRk3d8QkPvrum8rCIjJnRyHjMxcrSnQMzhf0MMAKTnip2keRregXfEwudx/SEiYLrUB9R34lnOx5hl/y+A== - dependencies: - "@fluentui/react-shared-contexts" "^9.0.0" - "@fluentui/react-tabster" "^9.1.0" - "@fluentui/react-theme" "^9.0.0" - "@fluentui/react-utilities" "^9.0.2" - "@griffel/core" "^1.5.1" - "@griffel/react" "^1.2.3" - tslib "^2.1.0" - -"@fluentui/react-theme@9.0.0": - version "9.0.0" - resolved "https://registry.yarnpkg.com/@fluentui/react-theme/-/react-theme-9.0.0.tgz#ff1ea2bbe66286d1561f51a01a4ce3e2b377374e" - integrity sha512-/cmGk4Yax/5hdumylkccSAydmlsvuEs/Vu5IFFxpFui0Nq8WrhHvyCzErQksInVP0Arl/UnbQKFO21qcR48Y+w== - dependencies: - tslib "^2.1.0" - "@griffel/babel-preset@1.3.6", "@griffel/babel-preset@^1.3.6": version "1.3.6" resolved "https://registry.yarnpkg.com/@griffel/babel-preset/-/babel-preset-1.3.6.tgz#2e7ff042217b9a0d50b40c8e18c16e029d65146f" @@ -1773,17 +1739,6 @@ stylis "^4.0.13" tslib "^2.1.0" -"@griffel/core@^1.6.0": - version "1.6.0" - resolved "https://registry.yarnpkg.com/@griffel/core/-/core-1.6.0.tgz#947a88f3e56db8da18f4fc81aee40d2b7a6fd90d" - integrity sha512-mHISgmjUYDC2/tnIfl32fuFlme6QIW81XO+OtRrhy6uxCV6BrBZtMfzlpOt7W/UCac4oHYldnYbpbsP3uYUFNg== - dependencies: - "@emotion/hash" "^0.8.0" - csstype "^3.0.10" - rtl-css-js "^1.16.0" - stylis "^4.0.13" - tslib "^2.1.0" - "@griffel/eslint-plugin@1.0.0": version "1.0.0" resolved "https://registry.yarnpkg.com/@griffel/eslint-plugin/-/eslint-plugin-1.0.0.tgz#cba251b7a140399c6686b72a72e9fa2ee481f532" @@ -1815,14 +1770,6 @@ "@griffel/core" "^1.5.1" tslib "^2.1.0" -"@griffel/react@^1.2.3": - version "1.3.1" - resolved "https://registry.yarnpkg.com/@griffel/react/-/react-1.3.1.tgz#6602aac57ea5aaebae8ea10c31dfb6f0dbb70248" - integrity sha512-R6dqoNFvn8ceaJ3HXvMelmGU23wJfZ9p1xmNnGgJmPENg8YFI0rKBBymU2D4z1ekqnRbUb9qNglCkSQ4AyL/wQ== - dependencies: - "@griffel/core" "^1.6.0" - tslib "^2.1.0" - "@griffel/webpack-extraction-plugin@0.1.4": version "0.1.4" resolved "https://registry.yarnpkg.com/@griffel/webpack-extraction-plugin/-/webpack-extraction-plugin-0.1.4.tgz#2410505aff385e93062c017a3b5f1e7167b2beb3"