-
-
Notifications
You must be signed in to change notification settings - Fork 1.1k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Waits for the manifests to be written before running the second loops (…
…#5871) **What's the problem this PR addresses?** I forgot to add a `Promise.all`, so the `package.json` files could end up corrupted when the constraints engine had to perform multiple iterations of the loop. Fixes #5853 **How did you fix it?** Adds `Promise.all` before running subsequent iterations. **Checklist** <!--- Don't worry if you miss something, chores are automatically tested. --> <!--- This checklist exists to help you remember doing the chores when you submit a PR. --> <!--- Put an `x` in all the boxes that apply. --> - [x] I have read the [Contributing Guide](https://yarnpkg.com/advanced/contributing). <!-- See https://yarnpkg.com/advanced/contributing#preparing-your-pr-to-be-released for more details. --> <!-- Check with `yarn version check` and fix with `yarn version check -i` --> - [x] I have set the packages that need to be released for my changes to be effective. <!-- The "Testing chores" workflow validates that your PR follows our guidelines. --> <!-- If it doesn't pass, click on it to see details as to what your PR might be missing. --> - [x] I will check that all automated PR checks pass before the PR gets reviewed.
- Loading branch information
Showing
5 changed files
with
85 additions
and
4 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,23 @@ | ||
releases: | ||
"@yarnpkg/cli": patch | ||
"@yarnpkg/plugin-constraints": patch | ||
|
||
declined: | ||
- "@yarnpkg/plugin-compat" | ||
- "@yarnpkg/plugin-dlx" | ||
- "@yarnpkg/plugin-essentials" | ||
- "@yarnpkg/plugin-init" | ||
- "@yarnpkg/plugin-interactive-tools" | ||
- "@yarnpkg/plugin-nm" | ||
- "@yarnpkg/plugin-npm-cli" | ||
- "@yarnpkg/plugin-pack" | ||
- "@yarnpkg/plugin-patch" | ||
- "@yarnpkg/plugin-pnp" | ||
- "@yarnpkg/plugin-pnpm" | ||
- "@yarnpkg/plugin-stage" | ||
- "@yarnpkg/plugin-typescript" | ||
- "@yarnpkg/plugin-version" | ||
- "@yarnpkg/plugin-workspace-tools" | ||
- "@yarnpkg/builder" | ||
- "@yarnpkg/core" | ||
- "@yarnpkg/doctor" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,30 @@ | ||
import {NodeFS, PortablePath, PosixFS, patchFs} from '@yarnpkg/fslib'; | ||
import fs from 'fs'; | ||
|
||
class SafeCheckFS extends NodeFS { | ||
private lockRegistry = new Set<PortablePath>(); | ||
|
||
async writeFilePromise(p: PortablePath, ...args: Array<any>) { | ||
return await this.lock(p, super.writeFilePromise, args); | ||
} | ||
|
||
private async lock(p: PortablePath, fn: (...args: Array<any>) => Promise<any>, args: Array<any>) { | ||
if (this.lockRegistry.has(p)) | ||
throw new Error(`Unsafe write detected: ${p}`); | ||
|
||
this.lockRegistry.add(p); | ||
try { | ||
return await fn.call(this, p, ...args); | ||
} finally { | ||
this.lockRegistry.delete(p); | ||
} | ||
} | ||
} | ||
|
||
// We must copy the fs into a local, because otherwise | ||
// 1. we would make the NodeFS instance use the function that we patched (infinite loop) | ||
// 2. Object.create(fs) isn't enough, since it won't prevent the proto from being modified | ||
const localFs: typeof fs = {...fs}; | ||
const nodeFs = new SafeCheckFS(localFs); | ||
|
||
patchFs(fs, new PosixFS(nodeFs)); |