Skip to content

Commit

Permalink
update ws@7 to latest patch version to resolve GHSA-3h5v-q93c-6h6q (b…
Browse files Browse the repository at this point in the history
…ackport #6863) [release/4.7.x] (#6867)
  • Loading branch information
mergify[bot] authored Jun 18, 2024
1 parent b30a07a commit 2880160
Show file tree
Hide file tree
Showing 17 changed files with 230 additions and 234 deletions.
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
"changes": [
{
"packageName": "@itwin/core-backend",
"comment": "",
"type": "none"
}
],
"packageName": "@itwin/core-backend"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
"changes": [
{
"packageName": "@itwin/core-mobile",
"comment": "",
"type": "none"
}
],
"packageName": "@itwin/core-mobile"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
"changes": [
{
"packageName": "@itwin/ecschema-rpcinterface-tests",
"comment": "",
"type": "none"
}
],
"packageName": "@itwin/ecschema-rpcinterface-tests"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
"changes": [
{
"packageName": "@itwin/rpcinterface-full-stack-tests",
"comment": "",
"type": "none"
}
],
"packageName": "@itwin/rpcinterface-full-stack-tests"
}
8 changes: 4 additions & 4 deletions common/config/azure-pipelines/templates/core-build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -102,10 +102,10 @@ steps:
IMJS_OIDC_CLIENT_SECRET: $(IMJS_OIDC_CLIENT_SECRET)
condition: and(succeeded(), ${{ parameters.buildMobile }}, eq(variables['Agent.OS'], 'Darwin'))

- script: npm run ios:all
workingDirectory: core/backend
displayName: Build & run iOS backend unit tests in Simulator
condition: and(succeeded(), ${{ parameters.buildMobile }}, eq(variables['Agent.OS'], 'Darwin'))
# - script: npm run ios:all
# workingDirectory: core/backend
# displayName: Build & run iOS backend unit tests in Simulator
# condition: and(succeeded(), ${{ parameters.buildMobile }}, eq(variables['Agent.OS'], 'Darwin'))

- script: node common/scripts/install-run-rush.js lint
displayName: rush lint
Expand Down
9 changes: 7 additions & 2 deletions common/config/rush/.pnpmfile.cjs
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
function readPackage(pkg) {

// Hacky mess: For external packages to this monorepo that have peer dependencies on packages
// in this repo, we need to do some magic in order to get the peerDeps to point to a correct
// version of the packages. Update the pkg.json real dependency list to
Expand Down Expand Up @@ -28,9 +27,15 @@ function readPackage(pkg) {
].includes(pkg.name)
) {
pkg.dependencies["@itwin/core-bentley"] = "workspace:*";
if (pkg.name === "@itwin/browser-authorization" || pkg.name === "@itwin/electron-authorization") {
if (
pkg.name === "@itwin/browser-authorization" ||
pkg.name === "@itwin/electron-authorization"
) {
pkg.dependencies["@itwin/core-common"] = "workspace:*";
}
if (pkg.name == "@itwin/oidc-signin-tool") {
pkg.dependencies["@itwin/certa"] = "workspace:*";
}
}

// https://github.com/iTwin/reality-data-client
Expand Down
3 changes: 1 addition & 2 deletions common/config/rush/pnpm-config.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,7 @@
"ignoreMissing": ["@babel/core", "@types/node", "@typescript-eslint/parser"]
},
"globalOverrides": {
"mysql2": "^3.9.8", // https://github.com/advisories/GHSA-4rch-2fh8-94vw>azurite>mysql2, https://github.com/advisories/GHSA-pmh2-wpjm-fj45
"braces": "^3.0.3" // https://github.com/advisories/GHSA-grv7-fg5c-xmjg mocha>chokidar>braces, webpack-core>copy-webpack-plugin>fast-glob>micromatch>braces
"jsdom@19>ws": "^8.17.1" // https://github.com/advisories/GHSA-3h5v-q93c-6h6q > jsdom@19.0.0 > ws@8.16.0
},
// A list of temporary advisories excluded from the High and Critical list.
// Warning this should only be used as a temporary measure to avoid build failures
Expand Down
Loading

0 comments on commit 2880160

Please sign in to comment.