Skip to content

Commit

Permalink
update rush - permanent fix for cve-2024-27980 (node security patch) …
Browse files Browse the repository at this point in the history
…(backport #6625) [release/4.5.x] (#6626)

Co-authored-by: Ben Polinsky <78756012+ben-polinsky@users.noreply.github.com>
  • Loading branch information
mergify[bot] and ben-polinsky authored Apr 15, 2024
1 parent ae7f200 commit 9cd6b98
Show file tree
Hide file tree
Showing 9 changed files with 97 additions and 67 deletions.
2 changes: 1 addition & 1 deletion common/config/azure-pipelines/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -46,4 +46,4 @@ jobs:
- checkout: self
- template: ./templates/core-build.yaml
parameters:
nodeVersion: 20.12.1
nodeVersion: 20.x
2 changes: 1 addition & 1 deletion common/config/azure-pipelines/jobs/docs-build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ jobs:
- task: UseNode@1
displayName: Use Node 20
inputs:
version: 20.12.1
version: 20.x
checkLatest: false

- script: |
Expand Down
4 changes: 2 additions & 2 deletions common/config/azure-pipelines/jobs/fast-ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -106,12 +106,12 @@ jobs:
clean: true
- template: ../templates/core-build.yaml
parameters:
nodeVersion: 20.12.1
nodeVersion: 20.x
buildMobile: true
# Will run if even there is a failure somewhere else in the pipeline.
- template: ../templates/publish-test-results.yaml
parameters:
nodeVersion: 20.12.1
nodeVersion: 20.x
# The publish script identifies any new packages not previously published and tags the build
- template: ../templates/publish.yaml

Expand Down
10 changes: 2 additions & 8 deletions common/config/rush/pnpm-config.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,9 @@
"useWorkspaces": true,
"strictPeerDependencies": false,
"globalPeerDependencyRules": {
"ignoreMissing": [
"@babel/core",
"@types/node",
"@typescript-eslint/parser"
]
},
"globalOverrides": {
"mysql2": "^3.9.4" // /~https://github.com/advisories/GHSA-fpw7-j2hg-69v5 - azurite has not yet mitigated
"ignoreMissing": ["@babel/core", "@types/node", "@typescript-eslint/parser"]
},
"globalOverrides": {},
// 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
// for development dependencies only.
Expand Down
3 changes: 3 additions & 0 deletions common/scripts/install-run-rush-pnpm.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 6 additions & 3 deletions common/scripts/install-run-rush.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions common/scripts/install-run-rushx.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

129 changes: 78 additions & 51 deletions common/scripts/install-run.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion rush.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"$schema": "https://developer.microsoft.com/json-schemas/rush/v5/rush.schema.json",
"rushVersion": "5.112.2",
"rushVersion": "5.120.2",
"pnpmVersion": "7.32.2",
"nodeSupportedVersionRange": "^18.12.0 || ^20.9.0",
"projectFolderMinDepth": 2,
Expand Down

0 comments on commit 9cd6b98

Please sign in to comment.