mitigate ws and braces vulnerabilities

iTwin · Jul 8, 2024 · debc003 · debc003
1 parent 0359ac6
commit debc003
Show file tree

Hide file tree

Showing 5 changed files with 38 additions and 83 deletions.
diff --git a/common/config/rush/pnpm-config.json b/common/config/rush/pnpm-config.json
@@ -0,0 +1,7 @@
+{
+    "$schema": "https://developer.microsoft.com/json-schemas/rush/v5/pnpm-config.schema.json",
+    "useWorkspaces": true,
+    "globalOverrides": {
+        "braces": "^3.0.3"
+    }
+}
diff --git a/common/config/rush/pnpm-lock.yaml b/common/config/rush/pnpm-lock.yaml
diff --git a/packages/apps/desktop-viewer-test/package.json b/packages/apps/desktop-viewer-test/package.json
@@ -96,7 +96,8 @@
     "rimraf": "^3.0.2",
     "sass": "^1.64.2",
     "typescript": "~5.0.4",
-    "webpack": "^5.1.2"
+    "webpack": "^5.1.2",
+    "ws": "^7.5.10"
   },
   "eslintConfig": {
     "extends": [

diff --git a/packages/apps/web-viewer-test/package.json b/packages/apps/web-viewer-test/package.json
@@ -48,7 +48,8 @@
     "@types/node": "^18.17.1",
     "@types/react": "^18.2.18",
     "@types/react-dom": "^18.2.7",
-    "typescript": "~5.0.4"
+    "typescript": "~5.0.4",
+    "ws": "^8.17.1"
   },
   "browserslist": [
     ">0.2%",

diff --git a/rush.json b/rush.json
@@ -2,9 +2,6 @@
   "$schema": "https://developer.microsoft.com/json-schemas/rush/v5/rush.schema.json",
   "rushVersion": "5.112.2",
   "pnpmVersion": "7.32.2",
-  "pnpmOptions": {
-    "useWorkspaces": true
-  },
   "nodeSupportedVersionRange": "^18.12.0 || ^20.9.0",
   "projectFolderMinDepth": 2,
   "projectFolderMaxDepth": 3,