Merge branch 'master' into update/examples-webpack

cypress-io · Sep 16, 2024 · b44b57b · b44b57b
2 parents 2148069 + f8960d5
commit b44b57b
Show file tree

Hide file tree

Showing 8 changed files with 41 additions and 18 deletions.
diff --git a/examples/config/package-lock.json b/examples/config/package-lock.json
diff --git a/examples/config/package.json b/examples/config/package.json
@@ -15,5 +15,10 @@
     "cypress": "13.14.2",
     "serve": "14.2.1",
     "start-server-and-test": "2.0.3"
+  },
+  "overrides": {
+    "serve": {
+      "path-to-regexp": "3.3.0"
+    }
   }
 }
diff --git a/examples/start-and-pnpm-workspaces/package.json b/examples/start-and-pnpm-workspaces/package.json
@@ -2,5 +2,10 @@
   "name": "start-and-pnpm-workspaces",
   "version": "1.0.0",
   "description": "example using pnpm with workspaces",
-  "private": true
+  "private": true,
+  "pnpm": {
+    "overrides": {
+      "path-to-regexp": "3.3.0"
+    }
+  }
 }
diff --git a/examples/start-and-pnpm-workspaces/pnpm-lock.yaml b/examples/start-and-pnpm-workspaces/pnpm-lock.yaml
diff --git a/examples/start-and-yarn-workspaces/package.json b/examples/start-and-yarn-workspaces/package.json
@@ -3,5 +3,8 @@
   "workspaces": [
     "workspace-1",
     "workspace-2"
-  ]
+  ],
+  "resolutions": {
+    "path-to-regexp": "3.3.0"
+  }
 }
diff --git a/examples/start-and-yarn-workspaces/yarn.lock b/examples/start-and-yarn-workspaces/yarn.lock
@@ -1076,10 +1076,10 @@ path-key@^3.0.0, path-key@^3.1.0:
   resolved "https://registry.yarnpkg.com/path-key/-/path-key-3.1.1.tgz#581f6ade658cbba65a0d3380de7753295054f375"
   integrity sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==
 
-[email protected]:
-  version "2.2.1"
-  resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-2.2.1.tgz#90b617025a16381a879bc82a38d4e8bdeb2bcf45"
-  integrity sha512-gu9bD6Ta5bwGrrU8muHzVOBFFREpp2iRkVfhBJahwJ6p6Xw20SjT0MxLnwkjOibQmGSYhiUnf2FLe7k+jcFmGQ==
+[email protected], [email protected]:
+  version "3.3.0"
+  resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-3.3.0.tgz#f7f31d32e8518c2660862b644414b6d5c63a611b"
+  integrity sha512-qyCH421YQPS2WFDxDjftfc1ZR5WKQzVzqsp4n9M2kQhVOo/ByahFoUNJfl58kOcEGfQ//7weFTDhm+ss8Ecxgw==
 
 pend@~1.2.0:
   version "1.2.0"

diff --git a/examples/start/package-lock.json b/examples/start/package-lock.json
diff --git a/examples/start/package.json b/examples/start/package.json
@@ -13,5 +13,10 @@
   "devDependencies": {
     "cypress": "13.14.2",
     "serve": "14.2.1"
+  },
+  "overrides": {
+    "serve": {
+      "path-to-regexp": "3.3.0"
+    }
   }
 }