Merge branch 'develop' into issue-30144-mime-to-4.x

Author: jennifer-shehane

.circleci/src/pipeline/@pipeline.yml

@@ -2133,6 +2133,7 @@ jobs:
 
   driver-integration-tests-electron:
     <<: *defaults
+    resource_class: medium+
     parallelism: 5
     steps:
       - run-driver-integration-tests:

.circleci/src/pipeline/commands/trigger-publish-binary-pipeline.yml

@@ -67,7 +67,7 @@ steps:
         fi
 
         echo "Pipeline saved to triggered_pipeline.json"
-        echo "Triggered pipeline: https://app.circleci.com/pipelines/github/cypress-io/cypress-publish-binary/$(jq -r '.number' triggered_pipeline.json)"
+        echo "Triggered pipeline: https://app.circleci.com/pipelines/github/cypress-io/cypress-publish-binary/$(jq -r '.number' ~/triggered_pipeline.json)"
   - persist_to_workspace:
       root: ~/
       paths:

package.json

@@ -273,7 +273,7 @@
   },
   "resolutions": {
     "**/@types/cheerio": "0.22.35",
-    "**/@types/enzyme": "3.10.5",
+    "**/@types/enzyme": "3.10.19",
     "**/jquery": "3.7.1",
     "**/socket.io-parser": "4.0.5",
     "**/ua-parser-js": "0.7.33",

packages/data-context/package.json

@@ -100,7 +100,7 @@
     "@types/babel__code-frame": "^7.0.6",
     "@types/dedent": "^0.7.2",
     "@types/ejs": "^3.1.2",
-    "@types/fs-extra": "^8.0.1",
+    "@types/fs-extra": "^8.1.5",
     "@types/graphql-resolve-batch": "1.1.6",
     "@types/jest": "^30.0.0",
     "@types/micromatch": "4.0.9",

packages/launchpad/package.json

@@ -39,7 +39,7 @@
     "@tooling/system-tests": "0.0.0-development",
     "@toycode/markdown-it-class": "1.2.4",
     "@types/dedent": "^0.7.2",
-    "@types/fs-extra": "^8.0.1",
+    "@types/fs-extra": "^8.1.5",
     "@urql/core": "2.4.4",
     "@urql/devtools": "2.0.3",
     "@urql/vue": "0.6.2",

yarn.lock

@@ -8116,7 +8116,7 @@
   dependencies:
     "@types/deep-eql" "*"
 
-"@types/cheerio@*", "@types/cheerio@0.22.35", "@types/cheerio@<1":
+"@types/cheerio@0.22.35", "@types/cheerio@<1":
   version "0.22.35"
   resolved "https://registry.yarnpkg.com/@types/cheerio/-/cheerio-0.22.35.tgz#0d16dc1f24d426231c181b9c31847f673867595f"
   integrity sha512-yD57BchKRvTV+JD53UZ6PD8KWY5g5rvvMLRnZR3EQBCZXiDT/HR+pKpMzFGlWNhFrXlo7VPZXtKvIEwZkAWOIA==
@@ -8230,13 +8230,13 @@
   dependencies:
     "@types/enzyme" "*"
 
-"@types/enzyme@*", "@types/enzyme@3.10.5":
-  version "3.10.5"
-  resolved "https://registry.yarnpkg.com/@types/enzyme/-/enzyme-3.10.5.tgz#fe7eeba3550369eed20e7fb565bfb74eec44f1f0"
-  integrity sha512-R+phe509UuUYy9Tk0YlSbipRpfVtIzb/9BHn5pTEtjJTF5LXvUjrIQcZvNyANNEyFrd2YGs196PniNT1fgvOQA==
+"@types/enzyme@*", "@types/enzyme@3.10.19":
+  version "3.10.19"
+  resolved "https://registry.yarnpkg.com/@types/enzyme/-/enzyme-3.10.19.tgz#a4ae751c13e0428171d53cdc0d3d9f9aca7f7689"
+  integrity sha512-kIfCo6/DdpgCHgmrLgPTugjzbZ46BUK8S2IP0kYo8+62LD2l1k8mSVsc+zQYNTdjDRoh2E9Spxu6F1NnEiW38Q==
   dependencies:
-    "@types/cheerio" "*"
-    "@types/react" "*"
+    "@types/cheerio" "<1"
+    "@types/react" "^16"
 
 "@types/eslint-scope@^3.7.3", "@types/eslint-scope@^3.7.7":
   version "3.7.7"
@@ -8334,10 +8334,10 @@
   dependencies:
     "@types/node" "*"
 
-"@types/fs-extra@^8.0.1":
-  version "8.1.1"
-  resolved "https://registry.yarnpkg.com/@types/fs-extra/-/fs-extra-8.1.1.tgz#1e49f22d09aa46e19b51c0b013cb63d0d923a068"
-  integrity sha512-TcUlBem321DFQzBNuz8p0CLLKp0VvF/XH9E4KHNmgwyp4E3AfgI5cjiIVZWlbfThBop2qxFIh4+LeY6hVWWZ2w==
+"@types/fs-extra@^8.0.1", "@types/fs-extra@^8.1.5":
+  version "8.1.5"
+  resolved "https://registry.yarnpkg.com/@types/fs-extra/-/fs-extra-8.1.5.tgz#33aae2962d3b3ec9219b5aca2555ee00274f5927"
+  integrity sha512-0dzKcwO+S8s2kuF5Z9oUWatQJj5Uq/iqphEtE3GQJVRRYm/tD1LglU2UnXi2A8jLq5umkGouOXOR9y0n613ZwQ==
   dependencies:
     "@types/node" "*"