Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

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

Merged
merged 2 commits into from
Mar 26, 2024
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0c06c99
fix(deps): fix dependencies post merge commit
kelset Mar 26, 2024
b54cf2f
add explicit mention of this step in readme
kelset Mar 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions apps/xplat-v9/README.md
View file
Open in desktop
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.
2 changes: 1 addition & 1 deletion packages/react-components/babel-preset-global-context/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
6 changes: 3 additions & 3 deletions packages/react-components/react-platform-adapter-preview/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
9 changes: 0 additions & 9 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1542,15 +1542,6 @@
debug "^4.3.1"
globals "^11.1.0"

"@babel/types@7.23.6":
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/types@7.24.0", "@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"
Expand Down
Loading