fix(deps): fix dependencies post merge commit (#30876)

microsoft · Mar 26, 2024 · 1afc47f · 1afc47f
1 parent cc1c782
commit 1afc47f
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 13 deletions.
diff --git a/apps/xplat-v9/README.md b/apps/xplat-v9/README.md
@@ -77,3 +77,5 @@ npx yarn-deduplicate --strategy fewer
 yarn install
 
 ```
+
+After doing so, before commiting any post-merge-commit fixes, make sure to also run `npx syncpack list-mismatches`. It is likely that the `xplat` branch is going to be somewhat out of sync with other changes from core, so make sure to address them before proceeding. Here's an example of a PR doing so.
diff --git a/packages/react-components/babel-preset-global-context/package.json b/packages/react-components/babel-preset-global-context/package.json
@@ -32,7 +32,7 @@
   "dependencies": {
     "@babel/core": "^7.10.4",
     "@babel/generator": "^7.12.13",
-    "@babel/types": "7.23.6",
+    "@babel/types": "7.24.0",
     "@babel/helper-plugin-utils": "^7.12.13",
     "@babel/template": "^7.12.13",
     "@babel/traverse": "^7.12.13",

diff --git a/packages/react-components/react-platform-adapter-preview/package.json b/packages/react-components/react-platform-adapter-preview/package.json
@@ -34,9 +34,9 @@
     "@stylexjs/stylex": "^0.5.1"
   },
   "dependencies": {
-    "@fluentui/react-shared-contexts": "^9.15.0",
-    "@fluentui/react-theme": "^9.1.17",
-    "@fluentui/react-utilities": "^9.18.3",
+    "@fluentui/react-shared-contexts": "^9.15.2",
+    "@fluentui/react-theme": "^9.1.19",
+    "@fluentui/react-utilities": "^9.18.5",
     "@griffel/core": "^1.14.1",
     "@griffel/react": "^1.5.14",
     "@swc/helpers": "^0.5.1",

diff --git a/yarn.lock b/yarn.lock
@@ -1542,15 +1542,6 @@
     debug "^4.3.1"
     globals "^11.1.0"
 
-"@babel/[email protected]":
-  version "7.23.6"
-  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.23.6.tgz#be33fdb151e1f5a56877d704492c240fc71c7ccd"
-  integrity sha512-+uarb83brBzPKN38NX1MkB6vb6+mwvR6amUulqAE7ccQw1pEl+bCia9TbdG1lsnFP7lZySvUn37CHyXQdfTwzg==
-  dependencies:
-    "@babel/helper-string-parser" "^7.23.4"
-    "@babel/helper-validator-identifier" "^7.22.20"
-    to-fast-properties "^2.0.0"
-
 "@babel/[email protected]", "@babel/types@^7.0.0", "@babel/types@^7.0.0-beta.49", "@babel/types@^7.10.4", "@babel/types@^7.12.11", "@babel/types@^7.12.7", "@babel/types@^7.20.0", "@babel/types@^7.20.7", "@babel/types@^7.22.15", "@babel/types@^7.22.19", "@babel/types@^7.22.5", "@babel/types@^7.23.0", "@babel/types@^7.23.4", "@babel/types@^7.23.6", "@babel/types@^7.24.0", "@babel/types@^7.3.3", "@babel/types@^7.4.4":
   version "7.24.0"
   resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.24.0.tgz#3b951f435a92e7333eba05b7566fd297960ea1bf"
Original file line number	Diff line number	Diff line change
Expand Up		@@ -77,3 +77,5 @@ npx yarn-deduplicate --strategy fewer
		yarn install

		```

		After doing so, before commiting any post-merge-commit fixes, make sure to also run `npx syncpack list-mismatches`. It is likely that the `xplat` branch is going to be somewhat out of sync with other changes from core, so make sure to address them before proceeding. Here's an example of a PR doing so.