Skip to content

Commit

Permalink
fix(deps): update dependency graceful-fs to v4.2.9 🌟 (#19676)
Browse files Browse the repository at this point in the history
* 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>
  • Loading branch information
4 people authored Jan 18, 2022
1 parent 3809cd4 commit 3b23887
Show file tree
Hide file tree
Showing 16 changed files with 793 additions and 88 deletions.
2 changes: 1 addition & 1 deletion packages/server/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@
"get-port": "5.1.1",
"getos": "3.2.1",
"glob": "7.1.3",
"graceful-fs": "4.2.0",
"graceful-fs": "4.2.9",
"http-proxy": "cypress-io/node-http-proxy#9322b4b69b34f13a6f3874e660a35df3305179c6",
"human-interval": "1.0.0",
"image-size": "0.8.3",
Expand Down
4 changes: 2 additions & 2 deletions system-tests/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -84,9 +84,9 @@ You can also set special properties in a test project's `package.json` to influe
`package.json` Property Name | Type | Description
--- | --- | ---
`_cySkipYarnInstall` | `boolean` | If `true`, skip the automatic `yarn install` for this package, even though it has a `package.json`.
`_cyYarnV2` | `boolean` | Run the yarn v2-style install command instead of yarn v1-style.
`_cyYarnV311` | `boolean` | Run the yarn v3.1.1-style install command instead of yarn v1-style.
`_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.

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

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.
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.
14 changes: 6 additions & 8 deletions system-tests/lib/fixtures.ts
Original file line number Diff line number Diff line change
Expand Up @@ -101,18 +101,16 @@ async function makeWorkspacePackagesAbsolute (pathToPkgJson: string): Promise<st
}

function getYarnCommand (opts: {
yarnV2: boolean
yarnV311: boolean
updateYarnLock: boolean
isCI: boolean
runScripts: boolean
}): string {
let cmd = `yarn install`

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

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

Expand Down Expand Up @@ -150,7 +148,7 @@ type SystemTestPkgJson = {
/**
* Run the yarn v2-style install command instead of yarn v1-style.
*/
_cyYarnV2?: boolean
_cyYarnV311?: 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.
Expand Down Expand Up @@ -230,7 +228,7 @@ export async function scaffoldProjectNodeModules (project: string, updateYarnLoc
// 4. Run `yarn install`.
const cmd = getYarnCommand({
updateYarnLock,
yarnV2: pkgJson._cyYarnV2,
yarnV311: pkgJson._cyYarnV311,
isCI: !!process.env.CI,
runScripts: pkgJson._cyRunScripts,
})
Expand Down
1 change: 0 additions & 1 deletion system-tests/projects/yarn-v2-pnp/.yarnrc.yml

This file was deleted.

55 changes: 0 additions & 55 deletions system-tests/projects/yarn-v2-pnp/yarn-berry.cjs

This file was deleted.

1 change: 1 addition & 0 deletions system-tests/projects/yarn-v3.1.1-pnp/.yarnrc.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
yarnPath: "./yarn-3.1.1.cjs"
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import * as head from 'lodash/head'

describe('yarn-v2-pnp', () => {
describe('yarn-v3.1.1-pnp', () => {
it('can load package from pnp runtime', () => {
expect(head([1, 2, 3])).to.equal(1)
})
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"name": "yarn-v2-pnp",
"name": "yarn-v3.1.1-pnp",
"version": "1.0.0",
"dependencies": {
"lodash": "^4.17.21"
Expand All @@ -8,5 +8,5 @@
"typescript": "^4.2.4"
},
"license": "MIT",
"_cyYarnV2": true
"_cyYarnV311": true
}
768 changes: 768 additions & 0 deletions system-tests/projects/yarn-v3.1.1-pnp/yarn-3.1.1.cjs

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# Manual changes might be lost - proceed with caution!

__metadata:
version: 4
version: 5
cacheKey: 7

"lodash@npm:^4.17.21":
Expand All @@ -22,19 +22,18 @@ typescript@^4.2.4:
languageName: node
linkType: hard

"typescript@patch:typescript@^4.2.4#builtin<compat/typescript>":
"typescript@patch:typescript@^4.2.4#~builtin<compat/typescript>":
version: 4.3.5
resolution: "typescript@patch:typescript@npm%3A4.3.5#builtin<compat/typescript>::version=4.3.5&hash=ddfc1b"
resolution: "typescript@patch:typescript@npm%3A4.3.5#~builtin<compat/typescript>::version=4.3.5&hash=493e53"
bin:
tsc: bin/tsc
tsserver: bin/tsserver
checksum: 7f0b8343f71ecac18095be1476b398aca420ab60dc207cc1efe078f381eef5527b80a518297720257114cdbda65612f8839e4b63e85dc95e67ac5cbbade8bdf0
languageName: node
linkType: hard

"yarn-v2-pnp@workspace:.":
"yarn-v3.1.1-pnp@workspace:.":
version: 0.0.0-use.local
resolution: "yarn-v2-pnp@workspace:."
resolution: "yarn-v3.1.1-pnp@workspace:."
dependencies:
lodash: ^4.17.21
typescript: ^4.2.4
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,14 @@ import systemTests from '../lib/system-tests'
import Fixtures from '../lib/fixtures'

const cypressCli = path.join(__dirname, '../../cli/bin/cypress')
const projectDir = Fixtures.projectPath('yarn-v2-pnp')
const projectDir = Fixtures.projectPath('yarn-v3.1.1-pnp')

describe('e2e yarn v2', () => {
describe('e2e yarn v3.1.1', () => {
systemTests.it('can compile plugin and test specs', {
snapshot: false,
command: 'yarn',
browser: 'electron',
project: 'yarn-v2-pnp',
project: 'yarn-v3.1.1-pnp',
onRun: async (run) => {
await run({
args: `node ${cypressCli} run --dev --project=./`.split(' '),
Expand Down
13 changes: 4 additions & 9 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -21070,15 +21070,10 @@ got@^9.6.0:
to-readable-stream "^1.0.0"
url-parse-lax "^3.0.0"

graceful-fs@*, graceful-fs@^4.0.0, graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.1.3, graceful-fs@^4.1.4, graceful-fs@^4.1.6, graceful-fs@^4.1.9, graceful-fs@^4.2.0, graceful-fs@^4.2.2, graceful-fs@^4.2.3, graceful-fs@^4.2.4, graceful-fs@^4.2.6:
version "4.2.8"
resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.8.tgz#e412b8d33f5e006593cbd3cee6df9f2cebbe802a"
integrity sha512-qkIilPUYcNhJpd33n0GBXTB1MMPp14TxEsEs0pTrsSVucApsYzW5V+Q8Qxhik6KU3evy+qkAAowTByymK0avdg==

graceful-fs@4.2.0:
version "4.2.0"
resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.0.tgz#8d8fdc73977cb04104721cb53666c1ca64cd328b"
integrity sha512-jpSvDPV4Cq/bgtpndIWbI5hmYxhQGHPC4d4cqBPb4DLniCfhJokdXhwhaDuLBGLQdvvRum/UiX6ECVIPvDXqdg==
graceful-fs@*, graceful-fs@4.2.9, graceful-fs@^4.0.0, graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.1.3, graceful-fs@^4.1.4, graceful-fs@^4.1.6, graceful-fs@^4.1.9, graceful-fs@^4.2.0, graceful-fs@^4.2.2, graceful-fs@^4.2.3, graceful-fs@^4.2.4, graceful-fs@^4.2.6:
version "4.2.9"
resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.9.tgz#041b05df45755e587a24942279b9d113146e1c96"
integrity sha512-NtNxqUcXgpW2iMrfqSfR73Glt39K+BLwWsPs94yR63v45T0Wbej7eRmL5cWfwEgqXnmjQp3zaJTshdRW/qC2ZQ==

"graceful-readlink@>= 1.0.0":
version "1.0.1"
Expand Down

0 comments on commit 3b23887

Please sign in to comment.