Skip to content

Commit 865aa4b

Browse files
hl662Copilot
hl662
and
Copilot
committed
resolve pnpm-lock conflicts
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
2 parents fb9bcc0 + e0d66be commit 865aa4b

51 files changed

Lines changed: 372 additions & 208 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎common/config/rush/pnpm-config.json‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,5 +37,13 @@
3737
]
3838
}
3939
}
40-
}
40+
},
41+
"globalOnlyBuiltDependencies": [
42+
"@bentley/imodeljs-native",
43+
"@itwin/oidc-signin-tool",
44+
"electron",
45+
"esbuild",
46+
"msw",
47+
"protobufjs"
48+
]
4149
}

‎common/config/rush/version-policies.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
{
33
"policyName": "prerelease-monorepo-lockStep",
44
"definitionName": "lockStepVersion",
5-
"version": "5.9.0-dev.4",
5+
"version": "5.9.0-dev.5",
66
"nextBump": "prerelease"
77
}
88
]

‎common/scripts/install-run-rush-pnpm.js‎

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎common/scripts/install-run-rush.js‎

Lines changed: 29 additions & 21 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎common/scripts/install-run-rushx.js‎

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)