Merge branch 'develop' into update-v8-snapshot-cache-on-develop

cypress-io · Jun 5, 2023 · 7840a94 · 7840a94 · cypress-bot · Jun 5, 2023
2 parents 56bd0ae + 4d5f903
commit 7840a94
Show file tree

Hide file tree

Showing 7 changed files with 5 additions and 21 deletions.
diff --git a/npm/create-cypress-tests/package.json b/npm/create-cypress-tests/package.json
@@ -21,10 +21,8 @@
     "chalk": "4.1.0",
     "cli-highlight": "2.1.10",
     "commander": "6.2.1",
-    "fast-glob": "3.2.7",
     "find-up": "5.0.0",
     "fs-extra": "^9.1.0",
-    "glob": "^7.1.6",
     "inquirer": "7.3.3",
     "ora": "^5.1.0",
     "recast": "0.20.4",

diff --git a/npm/create-cypress-tests/scripts/copy-templates.js b/npm/create-cypress-tests/scripts/copy-templates.js
@@ -1,4 +1,4 @@
-const fg = require('fast-glob')
+const globby = require('globby')
 const fs = require('fs-extra')
 const chalk = require('chalk')
 const path = require('path')
@@ -11,7 +11,7 @@ program
   const srcPath = path.resolve(__dirname, '..', 'src')
   const destinationPath = path.resolve(process.cwd(), destination)
 
-  const templates = await fg('**/*.template.js', {
+  const templates = await globby('**/*.template.js', {
     cwd: srcPath,
     onlyFiles: true,
     unique: true,

diff --git a/npm/webpack-preprocessor/package.json b/npm/webpack-preprocessor/package.json
@@ -38,7 +38,6 @@
     "cypress": "0.0.0-development",
     "dependency-check": "2.9.1",
     "deps-ok": "1.4.1",
-    "fast-glob": "3.1.1",
     "find-webpack": "1.5.0",
     "fs-extra": "^10.1.0",
     "mocha": "^7.1.0",

diff --git a/npm/webpack-preprocessor/test/e2e/e2e.spec.js b/npm/webpack-preprocessor/test/e2e/e2e.spec.js
@@ -1,11 +1,11 @@
 const { runTest } = require('./helpers')
 const path = require('path')
-const glob = require('fast-glob')
+const globby = require('globby')
 
 describe('can test', async () => {
   // runs every test in cypress/tests/e2e as its own test
   // the comment above the test will determine the assertion on the results
-  glob.sync(path.join(__dirname, '../../cypress/tests/e2e/**/*'))
+  globby.sync(path.join(__dirname, '../../cypress/tests/e2e/**/*'))
   .map((v) => {
     const filename = path.relative(process.cwd(), v)
 

diff --git a/packages/graphql/package.json b/packages/graphql/package.json
@@ -22,7 +22,6 @@
     "dedent": "^0.7.0",
     "express": "4.17.3",
     "express-graphql": "^0.12.0",
-    "getenv": "1.0.0",
     "graphql": "^15.5.1",
     "graphql-resolve-batch": "1.0.3",
     "graphql-scalars": "^1.10.0",

diff --git a/packages/server/package.json b/packages/server/package.json
@@ -69,7 +69,6 @@
     "fluent-ffmpeg": "2.1.2",
     "fs-extra": "9.1.0",
     "get-port": "5.1.1",
-    "getenv": "1.0.0",
     "getos": "3.2.1",
     "glob": "7.1.3",
     "graceful-fs": "4.2.9",

diff --git a/yarn.lock b/yarn.lock
@@ -14837,17 +14837,6 @@ fast-deep-equal@^3.1.1, fast-deep-equal@^3.1.3:
   resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz#3a7d56b559d6cbc3eb512325244e619a65c6c525"
   integrity sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==
 
-[email protected]:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.1.1.tgz#87ee30e9e9f3eb40d6f254a7997655da753d7c82"
-  integrity sha512-nTCREpBY8w8r+boyFYAx21iL6faSsQynliPHM4Uf56SbkyohCNxpVPEH9xrF5TXKy+IsjkPUHDKiUkzBVRXn9g==
-  dependencies:
-    "@nodelib/fs.stat" "^2.0.2"
-    "@nodelib/fs.walk" "^1.2.3"
-    glob-parent "^5.1.0"
-    merge2 "^1.3.0"
-    micromatch "^4.0.2"
-
 [email protected]:
   version "3.2.7"
   resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.7.tgz#fd6cb7a2d7e9aa7a7846111e85a196d6b2f766a1"
@@ -16046,7 +16035,7 @@ glob-parent@^3.1.0:
     is-glob "^3.1.0"
     path-dirname "^1.0.0"
 
-glob-parent@^5.0.0, glob-parent@^5.1.0, glob-parent@^5.1.1, glob-parent@^5.1.2, glob-parent@~5.1.0, glob-parent@~5.1.2:
+glob-parent@^5.0.0, glob-parent@^5.1.1, glob-parent@^5.1.2, glob-parent@~5.1.0, glob-parent@~5.1.2:
   version "5.1.2"
   resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.2.tgz#869832c58034fe68a4093c17dc15e8340d8401c4"
   integrity sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==