Skip to content

[pull] main from nodejs:main #844

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pull merged 2 commits into from
Mar 23, 2026
Merged

[pull] main from nodejs:main #844

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5d900be
doc: add path to vulnerabilities.json mention
RafaelGSS Mar 22, 2026
61102cd
doc: minor typo fix
JeffMatson Mar 22, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions doc/api/vm.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1835,10 +1835,10 @@ It does several things at once:

1. Creates a new context.
2. If `contextObject` is an object, [contextifies][contextified] it with the new context.
If `contextObject` is undefined, creates a new object and [contextifies][contextified] it.
If `contextObject` is undefined, creates a new object and [contextifies][contextified] it.
If `contextObject` is [`vm.constants.DONT_CONTEXTIFY`][], don't [contextify][contextified] anything.
3. Compiles the code as a`vm.Script`
4. Runs the compield code within the created context. The code does not have access to the scope in
3. Compiles the code as a `vm.Script`
4. Runs the compiled code within the created context. The code does not have access to the scope in
which this method is called.
5. Returns the result.

Expand Down
6 changes: 3 additions & 3 deletions doc/contributing/releases.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -314,22 +314,22 @@ git checkout -b v1.2.3-proposal upstream/v1.x-staging
You can also run:

```bash
git node release -S --prepare --security --filterLabel vX.x
git node release -S --prepare --security=../vulnerabilities.json --filterLabel vX.x
```

Example:

```bash
git checkout v20.x
git node release -S --prepare --security --filterLabel v20.x
git node release -S --prepare --security=../vulnerabilities.json --filterLabel v20.x
```

to automate the remaining steps until step 6 or you can perform it manually
following the below steps. For semver-minors, you can pass the new version
explicitly with `--newVersion` arg:

```bash
git node release -S --prepare --security --filterLabel v20.x --newVersion 20.20.0
git node release -S --prepare --security=../vulnerabilities.json --filterLabel v20.x --newVersion 20.20.0
```

<details>
Expand Down
Loading