Skip to content

Commit 3b23887

Browse files
renovate[bot]renovate-botmjhenkesryanthemanuel
authored
fix(deps): update dependency graceful-fs to v4.2.9 🌟 (#19676)
* fix(deps): update dependency graceful-fs to v4.2.9 🌟 * update yarn lock * Update yarn test to v 3.1.1 * more yarn v3.1.1 changes * update lock file * empty commit empty commit * empty commit * empty commit * empty commit Co-authored-by: Renovate Bot <bot@renovateapp.com> Co-authored-by: Matt Henkes <mjhenkes@gmail.com> Co-authored-by: Ryan Manuel <ryanm@cypress.io>
1 parent 3809cd4 commit 3b23887

File tree

16 files changed

+793
-88
lines changed

16 files changed

+793
-88
lines changed

packages/server/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@
6565
"get-port": "5.1.1",
6666
"getos": "3.2.1",
6767
"glob": "7.1.3",
68-
"graceful-fs": "4.2.0",
68+
"graceful-fs": "4.2.9",
6969
"http-proxy": "cypress-io/node-http-proxy#9322b4b69b34f13a6f3874e660a35df3305179c6",
7070
"human-interval": "1.0.0",
7171
"image-size": "0.8.3",

system-tests/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,9 +84,9 @@ You can also set special properties in a test project's `package.json` to influe
8484
`package.json` Property Name | Type | Description
8585
--- | --- | ---
8686
`_cySkipYarnInstall` | `boolean` | If `true`, skip the automatic `yarn install` for this package, even though it has a `package.json`.
87-
`_cyYarnV2` | `boolean` | Run the yarn v2-style install command instead of yarn v1-style.
87+
`_cyYarnV311` | `boolean` | Run the yarn v3.1.1-style install command instead of yarn v1-style.
8888
`_cyRunScripts` | `boolean` | By default, the automatic `yarn install` will not run postinstall scripts. This option, if set, will cause postinstall scripts to run for this project.
8989

9090
Run `yarn projects:yarn:install` to run `yarn install` for all projects with a `package.json`.
9191

92-
Use the `UPDATE_YARN_LOCK=1` environment variable with `yarn test` or `yarn projects:yarn:install` to allow the `yarn.lock` to be updated and synced back to the monorepo from the temp dir.
92+
Use the `UPDATE_YARN_LOCK=1` environment variable with `yarn test` or `yarn projects:yarn:install` to allow the `yarn.lock` to be updated and synced back to the monorepo from the temp dir.

system-tests/lib/fixtures.ts

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -101,18 +101,16 @@ async function makeWorkspacePackagesAbsolute (pathToPkgJson: string): Promise<st
101101
}
102102

103103
function getYarnCommand (opts: {
104-
yarnV2: boolean
104+
yarnV311: boolean
105105
updateYarnLock: boolean
106106
isCI: boolean
107107
runScripts: boolean
108108
}): string {
109109
let cmd = `yarn install`
110110

111-
if (opts.yarnV2) {
112-
// yarn v2's docs are no longer available on their site now that yarn v3 is out,
113-
// Internet Archive has them here:
114-
// @see https://web.archive.org/web/20210102223647/https://yarnpkg.com/cli/install
115-
if (!opts.runScripts) cmd += ' --skip-builds'
111+
if (opts.yarnV311) {
112+
// @see https://yarnpkg.com/cli/install
113+
if (!opts.runScripts) cmd += ' --mode=skip-build'
116114

117115
if (!opts.updateYarnLock) cmd += ' --immutable'
118116

@@ -150,7 +148,7 @@ type SystemTestPkgJson = {
150148
/**
151149
* Run the yarn v2-style install command instead of yarn v1-style.
152150
*/
153-
_cyYarnV2?: boolean
151+
_cyYarnV311?: boolean
154152
/**
155153
* By default, the automatic `yarn install` will not run postinstall scripts. This
156154
* option, if set, will cause postinstall scripts to run for this project.
@@ -230,7 +228,7 @@ export async function scaffoldProjectNodeModules (project: string, updateYarnLoc
230228
// 4. Run `yarn install`.
231229
const cmd = getYarnCommand({
232230
updateYarnLock,
233-
yarnV2: pkgJson._cyYarnV2,
231+
yarnV311: pkgJson._cyYarnV311,
234232
isCI: !!process.env.CI,
235233
runScripts: pkgJson._cyRunScripts,
236234
})

system-tests/projects/yarn-v2-pnp/.yarnrc.yml

Lines changed: 0 additions & 1 deletion
This file was deleted.

system-tests/projects/yarn-v2-pnp/yarn-berry.cjs

Lines changed: 0 additions & 55 deletions
This file was deleted.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
yarnPath: "./yarn-3.1.1.cjs"

system-tests/projects/yarn-v2-pnp/cypress/integration/index.ts renamed to system-tests/projects/yarn-v3.1.1-pnp/cypress/integration/index.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import * as head from 'lodash/head'
22

3-
describe('yarn-v2-pnp', () => {
3+
describe('yarn-v3.1.1-pnp', () => {
44
it('can load package from pnp runtime', () => {
55
expect(head([1, 2, 3])).to.equal(1)
66
})

0 commit comments

Comments
 (0)